]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/maint-am-abort-safely' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:42:55 +0000 (13:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:42:55 +0000 (13:42 -0800)
* jc/maint-am-abort-safely:
  am --abort: keep unrelated commits since the last failure and warn


Trivial merge