path: root/builtin/merge-base.c
AgeCommit message (Expand)Author
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-02-22builtin/merge-base: convert to struct object_idbrian m. carlson
2017-02-22refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson
2016-10-12merge-base: handle --fork-point without reflogJeff King
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King
2015-11-20Convert struct object to object_idbrian m. carlson
2015-01-14standardize usage info string formatAlex Henrie
2014-10-30get_merge_bases(): always clean-up object flagsJunio C Hamano
2014-01-10Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano
2013-12-30merge-base --octopus: reduce the result from get_octopus_merge_bases()Junio C Hamano
2013-12-30merge-base: separate "--independent" codepath into its own helperJunio C Hamano
2013-10-29merge-base: teach "--fork-point" modeJunio C Hamano
2013-10-23merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe
2012-09-11Merge branch 'jc/merge-bases'Junio C Hamano
2012-08-31merge-base: "--is-ancestor A B"Junio C Hamano
2012-08-20i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy
2011-04-15Documentation: update to git-merge-base --octopusVincent van Ravesteijn
2010-08-18merge-base --independent to print reduced parent list in a mergeJonathan Nieder
2010-08-18merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds