summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-02 01:04:14 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-02 01:04:14 -0700
commita93829ab35e8dadb58d2df162b9a537c99ccc72e (patch)
tree2b1f01661dd088a49aa07bc20f5ea1515ea93b0f /git-merge-one-file.sh
parentMerge branch 'lt/push' into next (diff)
parentfetch, pull: ask config for remote information (diff)
downloadtgif-a93829ab35e8dadb58d2df162b9a537c99ccc72e.tar.xz
Merge branch 'js/remoteconfig' into next
* js/remoteconfig: fetch, pull: ask config for remote information builtin-push: also ask config for remote information
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions