[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b918eb6 c970a6f)
Merge branch 'jc/maint-am-keep'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:35:07 +0000 (14:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 22:35:07 +0000 (14:35 -0800)
1  2 
git-am.sh patch | diff1 | diff2 | blob | history

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