summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:47:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:47:59 -0700
commit54a3c67375384a38eae946b7996d226dbd9c26d4 (patch)
tree3fcd52b8f8152dc87adb83469e755b205aaee82c /Documentation/git-merge-index.txt
parentMerge branch 'jk/daemon-user-doc' (diff)
parentt5570: do not assume the "matching" push is the default (diff)
downloadtgif-54a3c67375384a38eae946b7996d226dbd9c26d4.tar.xz
Merge branch 'jc/push-2.0-default-to-simple' (early part)
Adjust our tests for upcoming migration of the default value for the "push.default" configuration variable to "simple" from "mixed". * 'jc/push-2.0-default-to-simple' (early part): t5570: do not assume the "matching" push is the default t5551: do not assume the "matching" push is the default t5550: do not assume the "matching" push is the default t9401: do not assume the "matching" push is the default t9400: do not assume the "matching" push is the default t7406: do not assume the "matching" push is the default t5531: do not assume the "matching" push is the default t5519: do not assume the "matching" push is the default t5517: do not assume the "matching" push is the default t5516: do not assume the "matching" push is the default t5505: do not assume the "matching" push is the default t5404: do not assume the "matching" push is the default
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions