git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a036e4e 76b80cd)
Merge branch 'mm/merge-in-dirty-worktree-doc'
authorJunio C Hamano <redacted>
Wed, 26 Jun 2013 22:07:43 +0000 (15:07 -0700)
committerJunio C Hamano <redacted>
Wed, 26 Jun 2013 22:07:43 +0000 (15:07 -0700)
* mm/merge-in-dirty-worktree-doc:
  Documentation/git-merge.txt: weaken warning about uncommited changes

1  2 
Documentation/git-merge.txt patch | diff1 | diff2 | blob | history

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