diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2009-11-15 19:25:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-16 22:10:34 -0800 |
| commit | 31ddd1ee0fdd0a03001994d362023a04d8231eb0 (patch) | |
| tree | c2506e372e08138f1ea0a96a8f9a63ffec62c7af /Documentation/RelNotes-1.6.1.1.txt | |
| parent | Documentation: clarify 'ours' merge strategy (diff) | |
| download | tgif-31ddd1ee0fdd0a03001994d362023a04d8231eb0.tar.xz | |
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>
Diffstat (limited to 'Documentation/RelNotes-1.6.1.1.txt')
0 files changed, 0 insertions, 0 deletions