diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 18:33:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 18:33:33 (GMT) |
| commit | d5d1678b9c675a97b3ec3aaf843d02b1cf536c74 (patch) | |
| tree | a7eb19b48f19a2aea413545e09729813bbb5fc57 /advice.h | |
| parent | 55869681f1f0dc3fe9df0dd95f554f94dd519b72 (diff) | |
| parent | 8f29299136c2f11730d876cd62637a9e37d4c388 (diff) | |
| download | git-d5d1678b9c675a97b3ec3aaf843d02b1cf536c74.zip git-d5d1678b9c675a97b3ec3aaf843d02b1cf536c74.tar.gz git-d5d1678b9c675a97b3ec3aaf843d02b1cf536c74.tar.bz2 | |
Merge branch 'bm/merge-base-octopus-dedup'
"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 'advice.h')
0 files changed, 0 insertions, 0 deletions