diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:18 -0800 |
| commit | 2243d229f75be41318db8798fc90399dd6dedb42 (patch) | |
| tree | 6276ce793c1e7a0820b9131291f7c1882f5d88c2 /mergesort.h | |
| parent | Sync with v2.11.1 (diff) | |
| parent | unpack-trees: support super-prefix option (diff) | |
| download | tgif-2243d229f75be41318db8798fc90399dd6dedb42.tar.xz | |
Merge branch 'sb/unpack-trees-super-prefix'
"git read-tree" and its underlying unpack_trees() machinery learned
to report problematic paths prefixed with the --super-prefix option.
* sb/unpack-trees-super-prefix:
unpack-trees: support super-prefix option
t1001: modernize style
t1000: modernize style
read-tree: use OPT_BOOL instead of OPT_SET_INT
Diffstat (limited to 'mergesort.h')
0 files changed, 0 insertions, 0 deletions