Merge branch 'tm/completion-commit-fixup-squash'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:10 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:10 +0000 (21:37 -0700)
* tm/completion-commit-fixup-squash:
completion: commit --fixup and --squash
completion: unite --reuse-message and --reedit-message handling

1  2 
contrib/completion/git-completion.bash
Simple merge