summaryrefslogtreecommitdiffstats
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-18 20:23:23 +0200
committerJunio C Hamano <gitster@pobox.com>2018-06-18 20:23:23 +0200
commit4229478639c1c03a763ead3e30645b05f5e93ea1 (patch)
tree2b2dc1048a05556cbf5e12e8186b76a90230bd3e /merge-blobs.h
parentMerge branch 'js/rebase-i-root-fix' (diff)
parentt3200: clarify description of --set-upstream test (diff)
downloadgit-4229478639c1c03a763ead3e30645b05f5e93ea1.tar.xz
git-4229478639c1c03a763ead3e30645b05f5e93ea1.zip
Merge branch 'ks/branch-set-upstream'
A test title has been reworded to clarify it. * ks/branch-set-upstream: t3200: clarify description of --set-upstream test
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions