summaryrefslogtreecommitdiffstats
path: root/trace2.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-06-13 21:29:44 +0200
committerJunio C Hamano <gitster@pobox.com>2023-06-13 21:29:45 +0200
commit6901ffe80cefba50ad3e974b53c2457973e1425d (patch)
treec9c375ac1a6a1934b4097690d027b0c3224c92c3 /trace2.c
parentMerge branch 'kh/keep-tag-editmsg-upon-failure' (diff)
parentdiff: fix interaction between the "-s" option and other options (diff)
downloadgit-6901ffe80cefba50ad3e974b53c2457973e1425d.tar.xz
git-6901ffe80cefba50ad3e974b53c2457973e1425d.zip
Merge branch 'jc/diff-s-with-other-options'
The "-s" (silent, squelch) option of the "diff" family of commands did not interact with other options that specify the output format well. This has been cleaned up so that it will clear all the formatting options given before. * jc/diff-s-with-other-options: diff: fix interaction between the "-s" option and other options
Diffstat (limited to 'trace2.c')
0 files changed, 0 insertions, 0 deletions