diff options
author | Lars Hjemli <hjemli@gmail.com> | 2007-09-24 00:51:44 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:14:03 -0700 |
commit | d08af0ad745869a4fe36bc8df4f9804edfb74eb9 (patch) | |
tree | e12eb7e4ce147d4f4c386a8da97c3748950c84ca /t/t3402-rebase-merge.sh | |
parent | git-merge: add support for branch.<name>.mergeoptions (diff) | |
download | tgif-d08af0ad745869a4fe36bc8df4f9804edfb74eb9.tar.xz |
git-merge: add support for --commit and --no-squash
These options can be used to override --no-commit and --squash, which is
needed since --no-commit and --squash now can be specified as default merge
options in $GIT_DIR/config.
The change also introduces slightly different behavior for --no-commit:
when specified, it explicitly overrides --squash. Earlier,
'git merge --squash --no-commit' would result in a squashed merge (i.e. no
$GIT_DIR/MERGE_HEAD was created) but with this patch the command will
behave as if --squash hadn't been specified.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3402-rebase-merge.sh')
0 files changed, 0 insertions, 0 deletions