diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-04-14 11:49:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-04-14 11:49:12 -0700 |
commit | 3cdff83fb0519bcfed35bca987c59d3557b1f2a7 (patch) | |
tree | a8c7e2795b7d38eafd3ee7563c3a5223c8e3e2cb /contrib/diff-highlight | |
parent | Merge branch 'jk/pack-corruption-post-mortem' (diff) | |
parent | merge: pass verbosity flag down to merge-recursive (diff) | |
download | tgif-3cdff83fb0519bcfed35bca987c59d3557b1f2a7.tar.xz |
Merge branch 'jk/merge-quiet'
"git merge --quiet" did not squelch messages from the underlying
merge-recursive strategy.
* jk/merge-quiet:
merge: pass verbosity flag down to merge-recursive
Diffstat (limited to 'contrib/diff-highlight')
0 files changed, 0 insertions, 0 deletions