| commit | d66424c4ac661c69640765260235452499d80378 | |
| author | Lars Hjemli <hjemli@gmail.com> | |
| Sun, 23 Sep 2007 22:51:45 +0000 (24 00:51 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2007 00:14:03 +0000 (23 17:14 -0700) | ||
| tree | 26bfe8765b77b05e2d09653d433ffc6789ee3d4e | treesnapshot (tar.gz zip) |
| parent | d08af0ad745869a4fe36bc8df4f9804edfb74eb9 | commitdiff |
git-merge: add --ff and --no-ff options
These new options can be used to control the policy for fast-forward
merges: --ff allows it (this is the default) while --no-ff will create
a merge commit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
These new options can be used to control the policy for fast-forward
merges: --ff allows it (this is the default) while --no-ff will create
a merge commit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-options.txt | diffblobblamehistory | |
| git-merge.sh | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |