summaryrefslogtreecommitdiff
path: root/RelNotes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-04 17:42:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-06 15:01:56 -0700
commit0d8fc3efc65df74a2b39b3f9798861a1b2055b62 (patch)
tree8dbec03b5d44bc2fde3a04d5a5ada030d515e9de /RelNotes
parentGit 1.7.0 (diff)
downloadtgif-0d8fc3efc65df74a2b39b3f9798861a1b2055b62.tar.xz
merge: make branch.<name>.mergeoptions correctly override merge.<option>
The parsing of the additional command line parameters supplied to the branch.<name>.mergeoptions configuration variable was implemented at the wrong stage. If any merge-related variable came after we read branch.<name>.mergeoptions, the earlier value was overwritten. We should first read all the merge.* configuration, override them by reading from branch.<name>.mergeoptions and then finally read from the command line. This patch should fix it, even though I now strongly suspect that branch.<name>.mergeoptions that gives a single command line that needs to be parsed was likely to be an ill-conceived idea to begin with. Sigh... Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'RelNotes')
0 files changed, 0 insertions, 0 deletions