git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3288f20 31ddd1e)
Merge branch 'tr/maint-merge-ours-clarification' (early part)
authorJunio C Hamano <redacted>
Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800)
committerJunio C Hamano <redacted>
Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800)
* 'tr/maint-merge-ours-clarification' (early part):
  rebase docs: clarify --merge and --strategy
  Documentation: clarify 'ours' merge strategy

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

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