diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:41:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:41:38 -0700 |
| commit | 0569d7566e07f482ba8e7fa9dc629d987435513a (patch) | |
| tree | d7cd8da6f42f1869658cdeb36feaa843ede54d94 /builtin-add.c | |
| parent | f02fa3360510c6a2b75d2b52b8d1636788ab2605 (diff) | |
| parent | c5dc9a28298afb75d2be6b212d420fc89c258aa0 (diff) | |
| download | git-0569d7566e07f482ba8e7fa9dc629d987435513a.tar.gz git-0569d7566e07f482ba8e7fa9dc629d987435513a.tar.xz | |
Merge branch 'cc/merge-base-many'
* cc/merge-base-many:
git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge
merge-base-many: add trivial tests based on the documentation
documentation: merge-base: explain "git merge-base" with more than 2 args
merge-base: teach "git merge-base" to drive underlying merge_bases_many()
Diffstat (limited to 'builtin-add.c')
0 files changed, 0 insertions, 0 deletions