| commit | 31ddd1ee0fdd0a03001994d362023a04d8231eb0 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Sun, 15 Nov 2009 18:25:31 +0000 (15 19:25 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Nov 2009 06:10:34 +0000 (16 22:10 -0800) | ||
| tree | c2506e372e08138f1ea0a96a8f9a63ffec62c7af | treesnapshot (tar.gz zip) |
| parent | d4cbaa12a774a97dfa9e99aad9188dc802469bb6 | commitdiff |
rebase docs: clarify --merge and --strategy
Add a paragraph about the swapped sides in a --merge rebase, which was
otherwise only documented in the sources.
Add a paragraph about the effects of the 'ours' strategy to the -s
description. Also remove the mention of the 'octopus' strategy, which
was copied from the git-merge description but is pointless in a
rebase.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add a paragraph about the swapped sides in a --merge rebase, which was
otherwise only documented in the sources.
Add a paragraph about the effects of the 'ours' strategy to the -s
description. Also remove the mention of the 'octopus' strategy, which
was copied from the git-merge description but is pointless in a
rebase.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory |