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-ort.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-ort.c')
| -rw-r--r-- | merge-ort.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/merge-ort.c b/merge-ort.c index 6491070d96..77ba7f3020 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -19,7 +19,6 @@ #include "alloc.h" #include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h" @@ -42,8 +41,6 @@ #include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule-config.h" -#include "submodule.h" #include "trace2.h" #include "tree.h" #include "unpack-trees.h" |