]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:43:10 +0000 (13:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:43:10 +0000 (13:43 -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