summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
Commit message (Expand)AuthorAgeFilesLines
* builtin/merge-base: convert to struct object_idbrian m. carlson2017-02-221-14/+14
* refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson2017-02-221-3/+3
* merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-121-0/+3
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-1/+1
* Convert struct object to object_idbrian m. carlson2015-11-201-4/+4
* standardize usage info string formatAlex Henrie2015-01-141-2/+2
* get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-301-2/+2
* Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-101-6/+26
|\
| * merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-301-1/+1
| * merge-base: separate "--independent" codepath into its own helperJunio C Hamano2013-12-301-6/+25
* | merge-base: teach "--fork-point" modejc/merge-base-reflogJunio C Hamano2013-10-291-0/+109
* | merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano2013-10-231-16/+22
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-5/+5
|/
* use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-131-1/+1
* Merge branch 'jc/merge-bases'Junio C Hamano2012-09-111-0/+22
|\
| * merge-base: "--is-ancestor A B"Junio C Hamano2012-08-311-0/+22
* | i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-6/+6
|/
* Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-151-1/+2
* merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-181-6/+15
* merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-181-3/+32
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+63
View Lorry Controller Status