]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da81d47 9e7e41b)
Merge branch 'xw/am-empty'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 22:01:28 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 22:01:28 +0000 (14:01 -0800)
commitead6767ad7f835f4802248371709c4506ad6a4f1
tree62ddf372299fa9c8945738e604d45a9cd062286etree
parentda81d473fcfa67dfbcf0504d2b5225885e51e532commit | diff
parent9e7e41bf19ed10469f9adb60669b1699c81b8ea6commit | diff
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
t/t4150-am.sh diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.