summaryrefslogtreecommitdiff
path: root/git-parse-remote.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-24 10:18:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-24 10:18:35 (GMT)
commite036c90a913889dfa8097ebe73b619370e0c6f32 (patch)
tree2d910b13395345d9d9bc7c9137d1f6e9bb71d64a /git-parse-remote.sh
parent9def2138a17325c68961c3b1e6c967d33f28a4f1 (diff)
parente0ec18192db8a5f80705a81dfaa1caa3e6c48c1a (diff)
downloadgit-e036c90a913889dfa8097ebe73b619370e0c6f32.zip
git-e036c90a913889dfa8097ebe73b619370e0c6f32.tar.gz
git-e036c90a913889dfa8097ebe73b619370e0c6f32.tar.bz2
Merge branch 'sb/merge-friendly'
* sb/merge-friendly: Display 'theirs' branch name when possible in merge. Use extended SHA1 syntax in merge-recursive conflicts.
Diffstat (limited to 'git-parse-remote.sh')
0 files changed, 0 insertions, 0 deletions