| commit | 7637d672015507a892fc550b58fa639e4884cdd0 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 30 Jan 2009 01:11:23 +0000 (30 02:11 +0100) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 7 Feb 2010 17:55:11 +0000 (7 18:55 +0100) | ||
| tree | 9b7c3e41a4a872c10d81a73caa21c6b2fed309f4 | treesnapshot (tar.gz zip) |
| parent | e7848a85a553c720e40637411ce3c4633e7d9d25 | commitdiff |
split-topic-branches: add an option to avoid Octopus merge
Octopus merges cannot handle renames, amongst other niceties of recursive
merge, so allow the user to force merging the branches one by one.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Octopus merges cannot handle renames, amongst other niceties of recursive
merge, so allow the user to force merging the branches one by one.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| contrib/topic-branches/split-topic-branches.sh | diffblobblamehistory |