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)
commit31ddd1e...0fdd0a03001994d362023a04d8231eb0
treec2506e3...2e08138f1ea0a96a8f9a63ffec62c7afcopy hash to clipboard (tree)
parentd4cbaa1...a774a97dfa9e99aad9188dc802469bb6copy hash to clipboard (diff)
Documentation/git-rebase.txt