summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-22 18:19:03 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-22 18:19:03 -0800
commitc10d63451883f67c37622d2a21b2fc93be2f90c9 (patch)
treededdf29bb3a5f48b82a783d9c1254f5987736141 /git-merge.sh
parentgit-clone: Support changing the origin branch with -o (diff)
parentGIT 1.0.3 (diff)
downloadtgif-c10d63451883f67c37622d2a21b2fc93be2f90c9.tar.xz
Merge in fixes up to 1.0.3 maintenance branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions