]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/maint-rebase-rewrite-last-skip'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 19:26:59 +0000 (11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 19:26:59 +0000 (11:26 -0800)
* jc/maint-rebase-rewrite-last-skip:
  rebase --skip: correctly wrap-up when skipping the last patch

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge