diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:10 -0800 |
| commit | 0f7a10a3aad344a28f0f30b32a979925a9629533 (patch) | |
| tree | 1cc568818c02a2b9eee943dbb07d9485f93e3801 /merge.c | |
| parent | 3aea0dad70446222adf0e111aac70285a5735604 (diff) | |
| parent | d57c671a511d885a5cd390e3d6064c37af524a91 (diff) | |
| download | git-0f7a10a3aad344a28f0f30b32a979925a9629533.tar.gz | |
Merge branch 'en/header-cleanup' into maint-2.43
Remove unused header "#include".
* en/header-cleanup:
treewide: remove unnecessary includes in source files
treewide: add direct includes currently only pulled in transitively
trace2/tr2_tls.h: remove unnecessary include
submodule-config.h: remove unnecessary include
pkt-line.h: remove unnecessary include
line-log.h: remove unnecessary include
http.h: remove unnecessary include
fsmonitor--daemon.h: remove unnecessary includes
blame.h: remove unnecessary includes
archive.h: remove unnecessary include
treewide: remove unnecessary includes in source files
treewide: remove unnecessary includes from header files
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,6 +1,4 @@ #include "git-compat-util.h" -#include "diff.h" -#include "diffcore.h" #include "gettext.h" #include "hash.h" #include "hex.h" @@ -13,7 +11,6 @@ #include "tree.h" #include "tree-walk.h" #include "unpack-trees.h" -#include "dir.h" static const char *merge_argument(struct commit *commit) { |