diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-08 14:05:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-08 14:05:15 -0800 |
| commit | 492ee03f60297e7e83d101f4519ab8abc98782bc (patch) | |
| tree | 05800113e2443a2b1ec4771f38f2f3904528e5a9 /merge-recursive.c | |
| parent | Merge branch 'ml/doc-merge-updates' (diff) | |
| parent | treewide: remove unnecessary includes in source files (diff) | |
| download | git-492ee03f60297e7e83d101f4519ab8abc98782bc.tar.gz git-492ee03f60297e7e83d101f4519ab8abc98782bc.zip | |
Merge branch 'en/header-cleanup'
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-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index e3beb0801b..a0c3e7a2d9 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -6,10 +6,7 @@ #include "git-compat-util.h" #include "merge-recursive.h" -#include "advice.h" #include "alloc.h" -#include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h" @@ -32,8 +29,6 @@ #include "revision.h" #include "sparse-index.h" #include "string-list.h" -#include "submodule-config.h" -#include "submodule.h" #include "symlinks.h" #include "tag.h" #include "tree-walk.h" |