summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2007-03-31 14:00:18 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-31 15:22:59 -0700
commitd6bad6610aece0bcaf4449ce170de22970793110 (patch)
treef0c8c4bf8c6b99b9dcd12a9f24f894e7dfaaf2de /Documentation/git-merge-tree.txt
parentKeep rename/rename conflicts of intermediate merges while doing recursive merge (diff)
downloadtgif-d6bad6610aece0bcaf4449ce170de22970793110.tar.xz
git-svn: fail on rebase if we are unable to find a ref to rebase against
If we're on an invalid HEAD, we should detect this and avoid attempting to continue. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions