projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d08af0a) | patch
git-merge: add --ff and --no-ff options
authorLars Hjemli <hjemli@gmail.com>
Sun, 23 Sep 2007 22:51:45 +0000 (00:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:14:03 +0000 (17:14 -0700)
commitd66424c4ac661c69640765260235452499d80378
tree26bfe8765b77b05e2d09653d433ffc6789ee3d4etree | snapshot
parentd08af0ad745869a4fe36bc8df4f9804edfb74eb9commit | diff
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>
Documentation/merge-options.txt diff | blob | history
git-merge.sh diff | blob | history
t/t7600-merge.sh diff | blob | history
Git—the stupid content tracker