]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8befc50 c5ab03f)
Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Dec 2008 10:41:24 +0000 (02:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Dec 2008 10:41:24 +0000 (02:41 -0800)
commit60c91181faf33316211970cd2f332b39acb48399
tree0fa0c871b1b2d94e6852bcf2aaa247b07dbf99aftree | snapshot
parent8befc50c49e8a271fd3cd7fb34258fe88d1dfcadcommit | diff
parentc5ab03f26c992e30f355fba129f70db0f290fcd7commit | diff
Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix

* cb/maint-merge-recursive-fix:
  merge-recursive: do not clobber untracked working tree garbage
  modify/delete conflict resolution overwrites untracked file
merge-recursive.c diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.