| commit | 62a3a27b915c5f2a70796af15678cce1079d200a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Dec 2021 06:48:11 +0000 (22 22:48 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Dec 2021 06:48:11 +0000 (22 22:48 -0800) | ||
| tree | 001177f82a93de8fa831e7134c4ddcfbeb030a24 | treesnapshot (tar.gz zip) |
| parent | 553641555140a5aa4bab542246a401ea174364b7 | commitdiff |
| parent | 324eb77ee76277be99bdc54ef0b74ff30f5f567b | commitdiff |
Merge branch 'jz/apply-quiet-and-allow-empty'
"git apply" has been taught to ignore a message without a patch
with the "--allow-empty" option. It also learned to honor the
"--quiet" option given from the command line.
* jz/apply-quiet-and-allow-empty:
git-apply: add --allow-empty flag
git-apply: add --quiet flag
"git apply" has been taught to ignore a message without a patch
with the "--allow-empty" option. It also learned to honor the
"--quiet" option given from the command line.
* jz/apply-quiet-and-allow-empty:
git-apply: add --allow-empty flag
git-apply: add --quiet flag
| t/t4126-apply-empty.sh | diff1 | diff2 | blobhistory |