aboutsummaryrefslogtreecommitdiffstats
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 16:08:00 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-26 16:08:00 -0700
commiteb4e67288bb9d66fb46092fa30d72c4bdded0c2a (patch)
treeca6ac1501f7dd8de09fabe58072b5629445ff68c /notes-merge.c
parentmake the sample pre-commit hook script reject names with newlines, too (diff)
parentDocumentation/git-update-index: refer to 'ls-files' (diff)
downloadgit-eb4e67288bb9d66fb46092fa30d72c4bdded0c2a.tar.gz
git-eb4e67288bb9d66fb46092fa30d72c4bdded0c2a.zip
Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3
* sn/doc-update-index-assume-unchanged: Documentation/git-update-index: refer to 'ls-files'
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions