projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d4cbaa1) | patch
rebase docs: clarify --merge and --strategy
authorThomas Rast <trast@student.ethz.ch>
Sun, 15 Nov 2009 18:25:31 +0000 (19:25 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Nov 2009 06:10:34 +0000 (22:10 -0800)
commit31ddd1ee0fdd0a03001994d362023a04d8231eb0
treec2506e372e08138f1ea0a96a8f9a63ffec62c7aftree | snapshot
parentd4cbaa12a774a97dfa9e99aad9188dc802469bb6commit | diff
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>
Documentation/git-rebase.txt diff | blob | history
Git—the stupid content tracker