diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:01:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:01:28 -0800 |
| commit | ead6767ad7f835f4802248371709c4506ad6a4f1 (patch) | |
| tree | 62ddf372299fa9c8945738e604d45a9cd062286e /t/t6438-submodule-directory-file-conflicts.sh | |
| parent | Merge branch 'en/keep-cwd' (diff) | |
| parent | am: support --allow-empty to record specific empty patches (diff) | |
| download | tgif-ead6767ad7f835f4802248371709c4506ad6a4f1.tar.xz | |
Merge branch 'xw/am-empty'
"git am" learns "--empty=(stop|drop|keep)" option to tweak what is
done to a piece of e-mail without a patch in it.
* xw/am-empty:
am: support --allow-empty to record specific empty patches
am: support --empty=<option> to handle empty patches
doc: git-format-patch: describe the option --always
Diffstat (limited to 't/t6438-submodule-directory-file-conflicts.sh')
0 files changed, 0 insertions, 0 deletions