aboutsummaryrefslogtreecommitdiffstats
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-22 14:01:18 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-22 14:01:18 -0700
commitdef98035d00c57bb8723e7859366536504eb56aa (patch)
tree2f25c86607372632a845313f4e6ddea782c79440 /notes-merge.c
parentMerge branch 'maint' (diff)
parentDocumentation: git diff --check respects core.whitespace (diff)
downloadgit-def98035d00c57bb8723e7859366536504eb56aa.tar.gz
git-def98035d00c57bb8723e7859366536504eb56aa.zip
Merge branch 'maint'
* maint: Documentation: git diff --check respects core.whitespace
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions