aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-04 10:16:42 -0800
committerJunio C Hamano <gitster@pobox.com>2013-03-05 13:39:46 -0800
commit4c4b27e8cefdd88d76590c5fd786d1d43fb6f898 (patch)
treefe26261bf18395c38a6a4e9936caba717a97ea52 /git-mergetool.sh
parente895cb5135d7fbff8037ce83302aff12ee83667c (diff)
downloadgit-4c4b27e8cefdd88d76590c5fd786d1d43fb6f898.tar.gz
git-4c4b27e8cefdd88d76590c5fd786d1d43fb6f898.tar.xz
commit.c: add in_merge_bases_many()
Similar to in_merge_bases(commit, other) that returns true when commit is an ancestor (i.e. in the merge bases between the two) of the other commit, in_merge_bases_many(commit, n_other, other[]) checks if commit is an ancestor of any of the other[] commits. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions