summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-10-26 21:37:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-26 21:37:49 -0700
commitacbaf54f3030854b54f8391f7d1ca11935a75518 (patch)
treedc92358b6ea24796b4d73d5bc45d391eaa04af16 /Documentation/git-merge-index.txt
parentMerge branch 'maint' (diff)
parentdiff_tree(): Skip skip_uninteresting() when all remaining paths interesting (diff)
downloadtgif-acbaf54f3030854b54f8391f7d1ca11935a75518.tar.xz
Merge branch 'en/tree-walk-optim'
* en/tree-walk-optim: diff_tree(): Skip skip_uninteresting() when all remaining paths interesting tree_entry_interesting(): Make return value more specific tree-walk: Correct bitrotted comment about tree_entry() Document pre-condition for tree_entry_interesting
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions