summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-config-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-22 13:10:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-22 13:10:21 -0800
commit2bbea5c8f2242ee798e9bee525b485994a8e5911 (patch)
tree87e64824719bf59565685d3c3db09ea9ce31a248 /t/t5515/refs.br-config-explicit-merge
parentMerge branch 'pw/completion-stash' into maint (diff)
parentgrep: make it clear i-t-a entries are ignored (diff)
downloadtgif-2bbea5c8f2242ee798e9bee525b485994a8e5911.tar.xz
Merge branch 'nd/ita-cleanup' into maint
Paths that have been told the index about with "add -N" are not quite yet in the index, but a few commands behaved as if they already are in a harmful way. * nd/ita-cleanup: grep: make it clear i-t-a entries are ignored add and use a convenience macro ce_intent_to_add() blame: remove obsolete comment
Diffstat (limited to 't/t5515/refs.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions