projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d718c19 e63ec00)
Merge branch 'mm/maint-hint-failed-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800)
commit24807f9d5bada2475fddd153365c1debfe1309bc
tree5a16341ed3e937e0af47f57a6acbebe0df18f9cbtree | snapshot
parentd718c19bc686a15ed69cd7631e50613dd4901e03commit | diff
parente63ec003b2a0c89f0c1cbc4862dcef7c4a14a785commit | diff
Merge branch 'mm/maint-hint-failed-merge' into maint

* mm/maint-hint-failed-merge:
  user-manual: Document that "git merge" doesn't like uncommited changes.
  merge-recursive: point the user to commit when file would be overwritten.
Documentation/config.txt diff1 | diff2 | blob | history
Git—the stupid content tracker