summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-10 02:54:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-10 02:54:14 (GMT)
commit13956670a7baf4b3b794a2cc799bd501753f1746 (patch)
tree062177e5c6e31c9a9ddabb9066fd0331c2004f42 /git-pull.sh
parenta489352e3d1d861237729385f9afc5950bcfa6a0 (diff)
downloadgit-13956670a7baf4b3b794a2cc799bd501753f1746.zip
git-13956670a7baf4b3b794a2cc799bd501753f1746.tar.gz
git-13956670a7baf4b3b794a2cc799bd501753f1746.tar.bz2
Use 'merge-base --all' where applicable.
It may get extra merge base on truly pathological commit histories, but is a lot easier to understand, explain, and prove correctness. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions