summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
AgeCommit message (Expand)AuthorFilesLines
2014-10-30get_merge_bases(): always clean-up object flagsLibravatar Junio C Hamano1-2/+2
2014-01-10Merge branch 'bm/merge-base-octopus-dedup'Libravatar Junio C Hamano1-6/+26
2013-12-30merge-base --octopus: reduce the result from get_octopus_merge_bases()Libravatar Junio C Hamano1-1/+1
2013-12-30merge-base: separate "--independent" codepath into its own helperLibravatar Junio C Hamano1-6/+25
2013-10-29merge-base: teach "--fork-point" modeLibravatar Junio C Hamano1-0/+109
2013-10-23merge-base: use OPT_CMDMODE and clarify the command line parsingLibravatar Junio C Hamano1-16/+22
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLLibravatar Stefan Beller1-5/+5
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextLibravatar René Scharfe1-1/+1
2012-09-11Merge branch 'jc/merge-bases'Libravatar Junio C Hamano1-0/+22
2012-08-31merge-base: "--is-ancestor A B"Libravatar Junio C Hamano1-0/+22
2012-08-20i18n: merge-base: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-6/+6
2011-04-15Documentation: update to git-merge-base --octopusLibravatar Vincent van Ravesteijn1-1/+2
2010-08-18merge-base --independent to print reduced parent list in a mergeLibravatar Jonathan Nieder1-6/+15
2010-08-18merge-base --octopus to mimic show-branch --merge-baseLibravatar Jonathan Nieder1-3/+32
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+63
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:07:02 +0000