Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 22 Jul 2013 05:51:32 +0000
(22:51 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 22 Jul 2013 05:51:32 +0000
(22:51 -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
raw
|
combined
(merge:
80f0743
76b80cd
)
diff --cc
Documentation/git-merge.txt
Simple merge