summaryrefslogtreecommitdiff
path: root/mergetools/emerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:37:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-20 12:37:32 -0700
commit005a1de380733477382c50e2e44ed8042c401fed (patch)
tree16d8b71bca9dd50d0c46b14948920b374f88c634 /mergetools/emerge
parentMerge branch 'mm/commit-template-squelch-advice-messages' (diff)
parentcheck-ignore: Add option to ignore index contents (diff)
downloadtgif-005a1de380733477382c50e2e44ed8042c401fed.tar.xz
Merge branch 'dw/check-ignore-sans-index'
"git check-ignore" follows the same rule as "git add" and "git status" in that the ignore/exclude mechanism does not take effect on paths that are already tracked. With "--no-index" option, it can be used to diagnose which paths that should have been ignored have been mistakenly added to the index. * dw/check-ignore-sans-index: check-ignore: Add option to ignore index contents
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions