summaryrefslogtreecommitdiff
path: root/t/lib-gpg/secring.gpg
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-11 13:41:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-11 13:41:52 -0800
commit35d28f32e6492eb447bd271f40a5f0d53de4c46b (patch)
treedbfaadf829ea0aa8719594c04f4c8d89a2f63f1c /t/lib-gpg/secring.gpg
parentMerge branch 'jn/rerere-fail-on-auto-update-failure' (diff)
parentformat-patch: ignore diff.submodule setting (diff)
downloadtgif-35d28f32e6492eb447bd271f40a5f0d53de4c46b.tar.xz
Merge branch 'dk/format-patch-ignore-diff-submodule'
Setting diff.submodule to 'log' made "git format-patch" produce broken patches. * dk/format-patch-ignore-diff-submodule: format-patch: ignore diff.submodule setting t4255: test am submodule with diff.submodule
Diffstat (limited to 't/lib-gpg/secring.gpg')
0 files changed, 0 insertions, 0 deletions