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)
commitc50230f75109677d7adf0bd94f99d17f35a519a6
tree58d077c474e804bbd40133505fa0ee8d72c4a28d
parent3288f20171ce6aee5d9d51d111ee17cd4b426af4
parent31ddd1ee0fdd0a03001994d362023a04d8231eb0
Merge branch 'tr/maint-merge-ours-clarification' (early part)

* 'tr/maint-merge-ours-clarification' (early part):
  rebase docs: clarify --merge and --strategy
  Documentation: clarify 'ours' merge strategy
Documentation/git-rebase.txt