summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-15 10:28:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-15 10:28:34 -0700
commit9678ee7ba30a76b0b5c613126e659dcb1a206091 (patch)
tree84f70d381a8af68cad07a3242bfb2673623aadcf /Documentation/RelNotes
parentMerge branch 'jk/fetch-pack-many-refs' (diff)
parentmerge: handle --ff/--no-ff/--ff-only as a tri-state option (diff)
downloadtgif-9678ee7ba30a76b0b5c613126e659dcb1a206091.tar.xz
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 'Documentation/RelNotes')
0 files changed, 0 insertions, 0 deletions