summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-13 14:12:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-13 14:12:35 -0700
commit79296749161a422a103b6b13e4762600b94a87bc (patch)
treefae5f6ade41575bc9531b2cf32f87f4c076d12bc /rerere.h
parentMerge branch 'js/mingw-tests-2.8' (diff)
parentgit-format-patch.txt: don't show -s as shorthand for multiple options (diff)
downloadtgif-79296749161a422a103b6b13e4762600b94a87bc.tar.xz
Merge branch 'es/format-patch-doc-hide-no-patch'
"git format-patch --help" showed `-s` and `--no-patch` as if these are valid options to the command. We already hide `--patch` option from the documentation, because format-patch is about showing the diff, and the documentation now hides these options as well. * es/format-patch-doc-hide-no-patch: git-format-patch.txt: don't show -s as shorthand for multiple options
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions