diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-12 11:38:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-12 11:38:57 -0800 |
| commit | 832258da969fbedbbd1d474900dbdbdf23d4bca1 (patch) | |
| tree | 5a4e2d2b8d0f3be973f4871bdb85389db2063c74 /git-gui/lib/mergetool.tcl | |
| parent | e20d5a2c4433daf09797d9e4e9f6c4eaedec86dd (diff) | |
| parent | 2dacf26d0985521c0f30e535963a45257b63ea21 (diff) | |
Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'
Earlier we made "rev-list --object-edge" more aggressively list the
objects at the edge commits, in order to reduce number of objects
fetched into a shallow repository, but the change affected cases
other than "fetching into a shallow repository" and made it
unusably slow (e.g. fetching into a normal repository should not
have to suffer the overhead from extra processing). Limit it to a
more specific case by introducing --objects-edge-aggressive, a new
option to rev-list.
* bc/fetch-thin-less-aggressive-in-normal-repository:
pack-objects: use --objects-edge-aggressive for shallow repos
rev-list: add an option to mark fewer edges as uninteresting
Documentation: add missing article in rev-list-options.txt
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions
