aboutsummaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-27 21:51:29 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-27 21:51:29 -0700
commit2b83ade9778552526abbe34ae03a57da52a7433d (patch)
tree617052a511f352c0f18e97147b2f28b027fb0026 /git-merge-ours.sh
parentf2ce6a4c3c9dba3b2366e4c48bb7f417a2cb7fb8 (diff)
parent5a03e7f25334a6bf1dbbfdb9830d41de5b8f0d7f (diff)
downloadgit-2b83ade9778552526abbe34ae03a57da52a7433d.tar.gz
git-2b83ade9778552526abbe34ae03a57da52a7433d.tar.xz
Merge branch 'sp/void'
* sp/void: Allow git-checkout when on a non-existant branch.
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions