diff options
| author |  Lars Hjemli <hjemli@gmail.com> | 2007-09-24 00:51:45 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:14:03 -0700 |
| commit | d66424c4ac661c69640765260235452499d80378 (patch) | |
| tree | 26bfe8765b77b05e2d09653d433ffc6789ee3d4e /t/t0023-crlf-am.sh | |
| parent | git-merge: add support for --commit and --no-squash (diff) | |
| download | tgif-d66424c4ac661c69640765260235452499d80378.tar.xz | |
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>
Diffstat (limited to 't/t0023-crlf-am.sh')
0 files changed, 0 insertions, 0 deletions