summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-03-03 09:22:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-03 21:38:30 (GMT)
commite6d1f76ccf9de037c5479acdd9b6211e80145142 (patch)
tree4d76faa0fca57f3a3809ff9457fb34abdf762458 /Documentation
parentf23d1f76273a59b030ea1028016e6a9fc9679d2c (diff)
downloadgit-e6d1f76ccf9de037c5479acdd9b6211e80145142.zip
git-e6d1f76ccf9de037c5479acdd9b6211e80145142.tar.gz
git-e6d1f76ccf9de037c5479acdd9b6211e80145142.tar.bz2
git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
git-merge used to use either the --squash,--no-squash, --no-ff,--ff, --no-commit,--commit option, whichever came last in the command line. This lead to some un-intuitive behavior, having git merge --no-commit --no-ff <branch> actually commit the merge. Now git-merge respects --no-commit together with --no-ff, as well as other combinations of the options. However, this broke a selftest in t/t7600-merge.sh which expected to have --no-ff completely override the --squash option, so that git merge --squash --no-ff <branch> fast-forwards, and makes a merge commit; combining --squash with --no-ff doesn't really make sense though, and is now refused by git-merge. The test is adapted to test --no-ff without the preceding --squash, and another test is added to make sure the --squash --no-ff combination is refused. The unexpected behavior was reported by John Goerzen through http://bing.sdebian.org/468568 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions