summaryrefslogtreecommitdiff
path: root/Documentation/git-var.txt
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-10-03 06:13:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-03 07:25:42 (GMT)
commit88f8f0a52b2962452d89e854ad751283595473e4 (patch)
tree1167cf32d0708a77bed51a0bcc08334f282ab756 /Documentation/git-var.txt
parent99a19b43021024e12ddb67831f8e5919f86a5979 (diff)
downloadgit-88f8f0a52b2962452d89e854ad751283595473e4.zip
git-88f8f0a52b2962452d89e854ad751283595473e4.tar.gz
git-88f8f0a52b2962452d89e854ad751283595473e4.tar.bz2
[PATCH] Enable and fix support for base less merges.
Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less merge of A and B. [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge. I fixed a small typo in git-merge-resolve fix; 'test' equality check is spelled with single equal sign -- C-style double equal sign is bashism.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-var.txt')
0 files changed, 0 insertions, 0 deletions