Andrew's git / gitweb.git / diff
?
Merge branch 'tr/maint-merge-ours-clarification' (early part)
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
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