diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:59 -0800 |
| commit | 2cd861672e1021012f40597b9b68cc3a9af62e10 (patch) | |
| tree | 5638bb031b32cb06df4ec87ff8066c2ca48cd7c9 /csum-file.c | |
| parent | Merge branch 'jc/revision-range-unpeel' into maint (diff) | |
| parent | merge-base --octopus: reduce the result from get_octopus_merge_bases() (diff) | |
| download | tgif-2cd861672e1021012f40597b9b68cc3a9af62e10.tar.xz | |
Merge branch 'bm/merge-base-octopus-dedup' into maint
"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.
* bm/merge-base-octopus-dedup:
merge-base --octopus: reduce the result from get_octopus_merge_bases()
merge-base: separate "--independent" codepath into its own helper
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions