aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-02-08 16:22:10 -0800
committerJunio C Hamano <gitster@pobox.com>2024-02-08 16:22:10 -0800
commit0f7a10a3aad344a28f0f30b32a979925a9629533 (patch)
tree1cc568818c02a2b9eee943dbb07d9485f93e3801 /builtin/merge-recursive.c
parentMerge branch 'ml/doc-merge-updates' into maint-2.43 (diff)
parenttreewide: remove unnecessary includes in source files (diff)
downloadgit-0f7a10a3aad344a28f0f30b32a979925a9629533.tar.gz
git-0f7a10a3aad344a28f0f30b32a979925a9629533.zip
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 'builtin/merge-recursive.c')
-rw-r--r--builtin/merge-recursive.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 3366699657..c2ce044a20 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -1,13 +1,10 @@
#include "builtin.h"
#include "advice.h"
-#include "commit.h"
#include "gettext.h"
#include "hash.h"
-#include "tag.h"
#include "merge-recursive.h"
#include "object-name.h"
#include "repository.h"
-#include "xdiff-interface.h"
static const char builtin_merge_recursive_usage[] =
"git %s <base>... -- <head> <remote> ...";