summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-22 05:32:53 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-22 05:32:53 -0700
commit0c1d1ae43bf28f619a5397906a214a2e9c5ed916 (patch)
tree2cd288bcef8001340faad703aaf7f90c7415214c /git-merge-ours.sh
parentMerge branch 'master' into next (diff)
parentfetch-pack: output refs in the order they were given on the command line. (diff)
downloadtgif-0c1d1ae43bf28f619a5397906a214a2e9c5ed916.tar.xz
Merge branch 'jc/fetch-sorted' into next
* jc/fetch-sorted: fetch-pack: output refs in the order they were given on the command line.
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions