summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-22 11:38:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-22 11:38:42 -0700
commitc4125fccb4c310b440ef6b0d4ed3c8cb651e1afa (patch)
treed16eae7f6485892c92a03ed388bf4e3c616f8610 /git-merge-one-file.sh
parentt5570: Update for symref capability (diff)
parentclone: always set transport options (diff)
downloadtgif-c4125fccb4c310b440ef6b0d4ed3c8cb651e1afa.tar.xz
Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref
* jk/clone-progress-to-stderr: clone: always set transport options clone: treat "checking connectivity" like other progress clone: send diagnostic messages to stderr
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions