]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1e20a40) | patch
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
authorSergey Organov <sorganov@gmail.com>
Thu, 20 May 2021 21:47:02 +0000 (00:47 +0300)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2021 00:24:14 +0000 (09:24 +0900)
commitfd16a39944ce2f2967ed015379f5bd05bac639bb
tree4a6e70ac59f4019281af3e50dd4fcd70ae61cf06tree | snapshot
parent1e20a407fe28b4bdba3b973b26b0b60ff6b6c97dcommit | diff
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"

This is refactoring change in preparation for the next commit that
will let -m imply -p.

The old name doesn't match the intention to let not only -c/-cc imply
-p, but also -m, that is not a "combined" format, so we rename the
flag accordingly.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-merges.c diff | blob | blame | history
revision.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.