My favorite git aliases

[kpreid]

[alias]
	st = status
	hw = help -w
	ff = merge --ff-only
	unpushed = log @{u}..

Comments

[juan-gandhi.livejournal.com]

$ cat ~/pull
git stash
git pull --rebase origin refs/heads/master
git stash pop

[kpreid.livejournal.com]

Subversion user? :)

I'd put a set -e or &&s in there, just in case.

[juan-gandhi.livejournal.com]

Да, логично

[mark dominus (from livejournal.com)]

I have those exact same 'st' and 'ff' aliases. But I almost never use 'st'; I much more often use:

s = status -s

I also like:

ix = diff --cached
cp = cherry-pick
fixup = commit --amend -C HEAD

[kpreid.livejournal.com]

Isn't -C HEAD redundant with --amend's default behavior?

The idea of a shortcut for diff --cached is interesting. Do you use it before committing, or for other purposes? I always commit -v to show that diff in the log editor.

[mark dominus (from livejournal.com)]

--amend's default behavior is to run the editor so you can edit the log message. `-C HEAD` skips that and reuses the message without change. Very recent git (1.7.9) added `--no-edit`, which does the same thing.

I'm not sure how to characterize my use of git-ix. Right now all I can say is that I use it when I want to see what is staged! I probably use it after a complicated git-add -p to make sure I didn't stage anything I didn't mean to. I will try to notice what else I am doing next time I use it, and let you know.

[(Anonymous)]

lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
w = whatchanged