git amend

4 Responses to git amend

1. 

   Nick J09-May-2011 at 13:10

   Could run this at the command-line to get those aliases, maybe a minuscule amount less effort since don’t have to navigate to the right spot in the editor for pasting :-)

   git config –global alias.co checkout
   git config –global alias.ci commit
   git config –global alias.st status
   git config –global alias.br branch

   Reply
2. 

   Nick J09-May-2011 at 13:13

   oh, btw, that long dash, — , should appear/be typed as two dashes, but I think wordpress is trying to be too clever for its own good by converting it.

   Reply
3. 

   Sonia Hamilton09-May-2011 at 13:42

   Hi Nick, yes WordPress and double dashes… I need to migrate to a blog that handles code better – any ideas? Or is it just the WordPress theme I wonder?

   And the git config commands, yes I know :-) I have a series of scripts that keep all my machine settings all the same (.zshrc, git remotes, .screenrc, .vimrc and lots more…), and git config is run out of those scripts. And of course the scripts themselves are kept in git…

   For example, my ~/bin/gitconfig script does:

   #!/bin/bash
   # vim:filetype=sh
   
   [ -f "$HOME"/.gitconfig ] && rm "$HOME"/.gitconfig
   
   git config --global user.name "Sonia Hamilton"
   git config --global user.email "sonia@snowfrog.net"
   
   # color
   git config --global color.ui "auto"
   git config --global color.branch.current   "green"
   git config --global color.branch.local     "yellow"
   git config --global color.branch.remote    "red"
   
   git config --global color.diff.meta        "yellow bold"
   git config --global color.diff.frag        "magenta bold"
   git config --global color.diff.old         "red bold"
   git config --global color.diff.new         "green bold"
   
   # aliases
   git config --global alias.ci "commit"
   git config --global alias.co "checkout"
   git config --global alias.st "status"
   git config --global alias.br "branch"
   git config --global alias.sb "show-branch"
   git config --global alias.sbs "show-branch --sha1-name"
   git config --global alias.gr "log --graph --pretty=oneline --abbrev-commit"
   git config --global alias.cl "clean -x -d -f"
   git config --global alias.dt "difftool"
   git config --global alias.difft "difftool"
   
   # misc
   git config --global github.user soniah
   git config --global github.token secret.squirrel.stuff
   git config --global diff.tool vimdiff
   git config --global difftool.prompt false
   

   Reply
4. 

   Sonia Hamilton09-May-2011 at 13:45

   PS and my .zshrc controls my prompt to show git info, for example:

   sonia@uva ~/dotfiles j 1 (master‣1)

   I use https://github.com/olivierverdier/zsh-git-prompt for this.

   Reply