diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:33 -0800 |
| commit | d5d1678b9c675a97b3ec3aaf843d02b1cf536c74 (patch) | |
| tree | a7eb19b48f19a2aea413545e09729813bbb5fc57 /Documentation/howto/using-merge-subtree.txt | |
| parent | Merge branch 'km/gc-eperm' (diff) | |
| parent | merge-base --octopus: reduce the result from get_octopus_merge_bases() (diff) | |
| download | tgif-d5d1678b9c675a97b3ec3aaf843d02b1cf536c74.tar.xz | |
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 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions