aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/merge-bases'Junio C Hamano2012-09-11
|\
| * merge-base: "--is-ancestor A B"Junio C Hamano2012-08-31
* | i18n: merge-base: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
|/
* Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-15
* merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-18
* merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-18
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22