]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54d04f2 172b642)
Merge branch 'cb/maint-orphan-merge-noclobber' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:27:13 +0000 (11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:27:13 +0000 (11:27 -0800)
* cb/maint-orphan-merge-noclobber:
  do not overwrite untracked during merge from unborn branch

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history
t/t7607-merge-overwrite.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
diff --cc t/t7607-merge-overwrite.sh
Simple merge
local clone of git.git