projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 257c77a 172b642)
Merge branch 'cb/maint-orphan-merge-noclobber' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 19:02:14 +0000 (11:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 19:02:14 +0000 (11:02 -0800)
commit046c5e572bcb5cc0d59641ddcf472eb2f4a44652
tree64f1f12f5751dc854713460e73749f01579a7049tree | snapshot
parent257c77ac03b3f147304155136ef3ba57c01e4b9dcommit | diff
parent172b6428d06ff4eb0812f087a497d50b6c878fe1commit | diff
Merge branch 'cb/maint-orphan-merge-noclobber' into next

* cb/maint-orphan-merge-noclobber:
  do not overwrite untracked during merge from unborn branch

Conflicts:
t/t7607-merge-overwrite.sh
builtin/merge.c diff1 | diff2 | blob | history
t/t7607-merge-overwrite.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.