summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
AgeCommit message (Expand)Author
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