git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d718c19 e63ec00)
Merge branch 'mm/maint-hint-failed-merge' into maint
authorJunio C Hamano <redacted>
Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800)
committerJunio C Hamano <redacted>
Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800)
* 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.

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
git clone https://git.99rst.org/PROJECT