]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7785c31 7b3b7e3)
Merge branch 'jc/maint-am-abort-safely' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800)
* jc/maint-am-abort-safely:
  am --abort: keep unrelated commits since the last failure and warn

1  2 
git-am.sh patch | diff1 | diff2 | blob | history

diff --cc git-am.sh
Simple merge
Git - the stupid content tracker