diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:28:34 -0700 |
| commit | 9678ee7ba30a76b0b5c613126e659dcb1a206091 (patch) | |
| tree | 84f70d381a8af68cad07a3242bfb2673623aadcf /commit.h | |
| parent | dd28abca6ab1b8c4b55fdcadeaae092fc897c063 (diff) | |
| parent | a54841e96b78203598dea6b31b9618f40f107e7b (diff) | |
| download | git-9678ee7ba30a76b0b5c613126e659dcb1a206091.tar.gz | |
Merge branch 'mv/merge-ff-tristate'
The configuration variable "merge.ff" was cleary a tri-state to
choose one from "favor fast-forward when possible", "always create
a merge even when the history could fast-forward" and "do not
create any merge, only update when the history fast-forwards", but
the command line parser did not implement the usual convention of
"last one wins, and command line overrides the configuration"
correctly.
* mv/merge-ff-tristate:
merge: handle --ff/--no-ff/--ff-only as a tri-state option
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions