summaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2006-03-03 01:20:07 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-03-03 11:27:10 -0800
commit69f0d91e49dbf3c3942bae125c07ad17f6027f83 (patch)
treeea9a298863f655f495245d6b9dfbb2a0099d14b3 /merge-base.c
parentPrevent --index-info from ignoring -z. (diff)
downloadtgif-69f0d91e49dbf3c3942bae125c07ad17f6027f83.tar.xz
contrib/git-svn: add -b/--branch switch for branch detection
I've said I don't like branches in Subversion, and I still don't. This is a bit more flexible, though, as the argument for -b is any arbitrary git head/tag reference. This makes some things easier: * Importing git history into a brand new SVN branch. * Tracking multiple SVN branches via GIT_SVN_ID, even from multiple repositories. * Adding tags from SVN (still need to use GIT_SVN_ID, though). * Even merge tracking is supported, if and only the heads end up with 100% equivalent tree objects. This is more stricter but more robust and foolproof than parsing commit messages, imho. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions