![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Nov 2009 00:28:06 +0000 (16:28 -0800) | ||
| commit | c50230f75109677d7adf0bd94f99d17f35a519a6 | |
| tree | 58d077c474e804bbd40133505fa0ee8d72c4a28d | tree | snapshot |
| parent | 3288f20171ce6aee5d9d51d111ee17cd4b426af4 | commit | diff |
| parent | 31ddd1ee0fdd0a03001994d362023a04d8231eb0 | commit | diff |
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
* 'tr/maint-merge-ours-clarification' (early part):
rebase docs: clarify --merge and --strategy
Documentation: clarify 'ours' merge strategy
| Documentation/git-rebase.txt | diff1 | | diff2 | | blob | history |