summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:26:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:26:05 -0700
commitd52571d5c10efeb35ceeeb17f9b5e5f0ca1c3019 (patch)
tree50756c4e80c3e6faae46333eb60dff8784df7b2c /Documentation/git-merge-index.txt
parentMerge branch 'jk/commit-dates-parsing-fix' (diff)
parentremote: handle pushremote config in any order (diff)
downloadtgif-d52571d5c10efeb35ceeeb17f9b5e5f0ca1c3019.tar.xz
Merge branch 'jk/remote-pushremote-config-reading'
"git push" did not pay attention to branch.*.pushremote if it is defined earlier than remote.pushdefault; the order of these two variables in the configuration file should not matter, but it did by mistake. * jk/remote-pushremote-config-reading: remote: handle pushremote config in any order
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions