[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b917662 8499644)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 21:22:26 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 21:22:26 +0000 (14:22 -0700)
* maint:
  Prepare for 1.7.6.1
  am: refresh the index at start and --resolved

Conflicts:
GIT-VERSION-GEN
RelNotes

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

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