diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:46:36 -0700 |
| commit | fc26f57b847b86ba330ea543a6dfc86a10d4cce3 (patch) | |
| tree | 91e48380bbabaa47699db38c00c5c056d6ea48d2 /t/t7607-merge-overwrite.sh | |
| parent | Merge branch 'mm/rebase-i-exec-edit' into maint (diff) | |
| parent | diff-index: pass pathspec down to unpack-trees machinery (diff) | |
| download | tgif-fc26f57b847b86ba330ea543a6dfc86a10d4cce3.tar.xz | |
Merge branch 'jc/diff-index-unpack' into maint
* jc/diff-index-unpack:
diff-index: pass pathspec down to unpack-trees machinery
unpack-trees: allow pruning with pathspec
traverse_trees(): allow pruning with pathspec
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions