]> 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: 3681d40 c82d711)
Merge branch 'sp/merge' (early part)
authorJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)
* 'sp/merge' (early part):
  Improve merge performance by avoiding in-index merges.

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

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