90 files changed, 107 insertions, 107 deletions
diff --git a/Makefile b/Makefile
index f64610a57..cdc58fed7 100644
--- a/Makefile
+++ b/Makefile
@@ -308,7 +308,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 # Those must not be GNU-specific; they are shared with perl/ which may
 # be built by a different compiler. (Note that this is an artifact now
 # but it still might be nice to keep that distinction.)
-BASIC_CFLAGS =
+BASIC_CFLAGS = -I.
 BASIC_LDFLAGS =
 
 # Guard against environment variables
@@ -397,8 +397,8 @@ TEST_PROGRAMS_NEED_X += test-index-version
 TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
 
 # List built-in command $C whose implementation cmd_$C() is not in
-# builtin-$C.o but is linked in as part of some other command.
-BUILT_INS += $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
+# builtin/$C.o but is linked in as part of some other command.
+BUILT_INS += $(patsubst builtin/%.o,git-%$X,$(BUILTIN_OBJS))
 
 BUILT_INS += git-cherry$X
 BUILT_INS += git-cherry-pick$X
@@ -624,95 +624,95 @@ LIB_OBJS += ws.o
 LIB_OBJS += wt-status.o
 LIB_OBJS += xdiff-interface.o
 
-BUILTIN_OBJS += builtin-add.o
-BUILTIN_OBJS += builtin-annotate.o
-BUILTIN_OBJS += builtin-apply.o
-BUILTIN_OBJS += builtin-archive.o
-BUILTIN_OBJS += builtin-bisect--helper.o
-BUILTIN_OBJS += builtin-blame.o
-BUILTIN_OBJS += builtin-branch.o
-BUILTIN_OBJS += builtin-bundle.o
-BUILTIN_OBJS += builtin-cat-file.o
-BUILTIN_OBJS += builtin-check-attr.o
-BUILTIN_OBJS += builtin-check-ref-format.o
-BUILTIN_OBJS += builtin-checkout-index.o
-BUILTIN_OBJS += builtin-checkout.o
-BUILTIN_OBJS += builtin-clean.o
-BUILTIN_OBJS += builtin-clone.o
-BUILTIN_OBJS += builtin-commit-tree.o
-BUILTIN_OBJS += builtin-commit.o
-BUILTIN_OBJS += builtin-config.o
-BUILTIN_OBJS += builtin-count-objects.o
-BUILTIN_OBJS += builtin-describe.o
-BUILTIN_OBJS += builtin-diff-files.o
-BUILTIN_OBJS += builtin-diff-index.o
-BUILTIN_OBJS += builtin-diff-tree.o
-BUILTIN_OBJS += builtin-diff.o
-BUILTIN_OBJS += builtin-fast-export.o
-BUILTIN_OBJS += builtin-fetch-pack.o
-BUILTIN_OBJS += builtin-fetch.o
-BUILTIN_OBJS += builtin-fmt-merge-msg.o
-BUILTIN_OBJS += builtin-for-each-ref.o
-BUILTIN_OBJS += builtin-fsck.o
-BUILTIN_OBJS += builtin-gc.o
-BUILTIN_OBJS += builtin-grep.o
-BUILTIN_OBJS += builtin-hash-object.o
-BUILTIN_OBJS += builtin-help.o
-BUILTIN_OBJS += builtin-index-pack.o
-BUILTIN_OBJS += builtin-init-db.o
-BUILTIN_OBJS += builtin-log.o
-BUILTIN_OBJS += builtin-ls-files.o
-BUILTIN_OBJS += builtin-ls-remote.o
-BUILTIN_OBJS += builtin-ls-tree.o
-BUILTIN_OBJS += builtin-mailinfo.o
-BUILTIN_OBJS += builtin-mailsplit.o
-BUILTIN_OBJS += builtin-merge.o
-BUILTIN_OBJS += builtin-merge-base.o
-BUILTIN_OBJS += builtin-merge-file.o
-BUILTIN_OBJS += builtin-merge-index.o
-BUILTIN_OBJS += builtin-merge-ours.o
-BUILTIN_OBJS += builtin-merge-recursive.o
-BUILTIN_OBJS += builtin-merge-tree.o
-BUILTIN_OBJS += builtin-mktag.o
-BUILTIN_OBJS += builtin-mktree.o
-BUILTIN_OBJS += builtin-mv.o
-BUILTIN_OBJS += builtin-name-rev.o
-BUILTIN_OBJS += builtin-pack-objects.o
-BUILTIN_OBJS += builtin-pack-redundant.o
-BUILTIN_OBJS += builtin-pack-refs.o
-BUILTIN_OBJS += builtin-patch-id.o
-BUILTIN_OBJS += builtin-prune-packed.o
-BUILTIN_OBJS += builtin-prune.o
-BUILTIN_OBJS += builtin-push.o
-BUILTIN_OBJS += builtin-read-tree.o
-BUILTIN_OBJS += builtin-receive-pack.o
-BUILTIN_OBJS += builtin-reflog.o
-BUILTIN_OBJS += builtin-remote.o
-BUILTIN_OBJS += builtin-replace.o
-BUILTIN_OBJS += builtin-rerere.o
-BUILTIN_OBJS += builtin-reset.o
-BUILTIN_OBJS += builtin-rev-list.o
-BUILTIN_OBJS += builtin-rev-parse.o
-BUILTIN_OBJS += builtin-revert.o
-BUILTIN_OBJS += builtin-rm.o
-BUILTIN_OBJS += builtin-send-pack.o
-BUILTIN_OBJS += builtin-shortlog.o
-BUILTIN_OBJS += builtin-show-branch.o
-BUILTIN_OBJS += builtin-show-ref.o
-BUILTIN_OBJS += builtin-stripspace.o
-BUILTIN_OBJS += builtin-symbolic-ref.o
-BUILTIN_OBJS += builtin-tag.o
-BUILTIN_OBJS += builtin-tar-tree.o
-BUILTIN_OBJS += builtin-unpack-file.o
-BUILTIN_OBJS += builtin-unpack-objects.o
-BUILTIN_OBJS += builtin-update-index.o
-BUILTIN_OBJS += builtin-update-ref.o
-BUILTIN_OBJS += builtin-update-server-info.o
-BUILTIN_OBJS += builtin-upload-archive.o
-BUILTIN_OBJS += builtin-var.o
-BUILTIN_OBJS += builtin-verify-pack.o
-BUILTIN_OBJS += builtin-verify-tag.o
-BUILTIN_OBJS += builtin-write-tree.o
+BUILTIN_OBJS += builtin/add.o
+BUILTIN_OBJS += builtin/annotate.o
+BUILTIN_OBJS += builtin/apply.o
+BUILTIN_OBJS += builtin/archive.o
+BUILTIN_OBJS += builtin/bisect--helper.o
+BUILTIN_OBJS += builtin/blame.o
+BUILTIN_OBJS += builtin/branch.o
+BUILTIN_OBJS += builtin/bundle.o
+BUILTIN_OBJS += builtin/cat-file.o
+BUILTIN_OBJS += builtin/check-attr.o
+BUILTIN_OBJS += builtin/check-ref-format.o
+BUILTIN_OBJS += builtin/checkout-index.o
+BUILTIN_OBJS += builtin/checkout.o
+BUILTIN_OBJS += builtin/clean.o
+BUILTIN_OBJS += builtin/clone.o
+BUILTIN_OBJS += builtin/commit-tree.o
+BUILTIN_OBJS += builtin/commit.o
+BUILTIN_OBJS += builtin/config.o
+BUILTIN_OBJS += builtin/count-objects.o
+BUILTIN_OBJS += builtin/describe.o
+BUILTIN_OBJS += builtin/diff-files.o
+BUILTIN_OBJS += builtin/diff-index.o
+BUILTIN_OBJS += builtin/diff-tree.o
+BUILTIN_OBJS += builtin/diff.o
+BUILTIN_OBJS += builtin/fast-export.o
+BUILTIN_OBJS += builtin/fetch-pack.o
+BUILTIN_OBJS += builtin/fetch.o
+BUILTIN_OBJS += builtin/fmt-merge-msg.o
+BUILTIN_OBJS += builtin/for-each-ref.o
+BUILTIN_OBJS += builtin/fsck.o
+BUILTIN_OBJS += builtin/gc.o
+BUILTIN_OBJS += builtin/grep.o
+BUILTIN_OBJS += builtin/hash-object.o
+BUILTIN_OBJS += builtin/help.o
+BUILTIN_OBJS += builtin/index-pack.o
+BUILTIN_OBJS += builtin/init-db.o
+BUILTIN_OBJS += builtin/log.o
+BUILTIN_OBJS += builtin/ls-files.o
+BUILTIN_OBJS += builtin/ls-remote.o
+BUILTIN_OBJS += builtin/ls-tree.o
+BUILTIN_OBJS += builtin/mailinfo.o
+BUILTIN_OBJS += builtin/mailsplit.o
+BUILTIN_OBJS += builtin/merge.o
+BUILTIN_OBJS += builtin/merge-base.o
+BUILTIN_OBJS += builtin/merge-file.o
+BUILTIN_OBJS += builtin/merge-index.o
+BUILTIN_OBJS += builtin/merge-ours.o
+BUILTIN_OBJS += builtin/merge-recursive.o
+BUILTIN_OBJS += builtin/merge-tree.o
+BUILTIN_OBJS += builtin/mktag.o
+BUILTIN_OBJS += builtin/mktree.o
+BUILTIN_OBJS += builtin/mv.o
+BUILTIN_OBJS += builtin/name-rev.o
+BUILTIN_OBJS += builtin/pack-objects.o
+BUILTIN_OBJS += builtin/pack-redundant.o
+BUILTIN_OBJS += builtin/pack-refs.o
+BUILTIN_OBJS += builtin/patch-id.o
+BUILTIN_OBJS += builtin/prune-packed.o
+BUILTIN_OBJS += builtin/prune.o
+BUILTIN_OBJS += builtin/push.o
+BUILTIN_OBJS += builtin/read-tree.o
+BUILTIN_OBJS += builtin/receive-pack.o
+BUILTIN_OBJS += builtin/reflog.o
+BUILTIN_OBJS += builtin/remote.o
+BUILTIN_OBJS += builtin/replace.o
+BUILTIN_OBJS += builtin/rerere.o
+BUILTIN_OBJS += builtin/reset.o
+BUILTIN_OBJS += builtin/rev-list.o
+BUILTIN_OBJS += builtin/rev-parse.o
+BUILTIN_OBJS += builtin/revert.o
+BUILTIN_OBJS += builtin/rm.o
+BUILTIN_OBJS += builtin/send-pack.o
+BUILTIN_OBJS += builtin/shortlog.o
+BUILTIN_OBJS += builtin/show-branch.o
+BUILTIN_OBJS += builtin/show-ref.o
+BUILTIN_OBJS += builtin/stripspace.o
+BUILTIN_OBJS += builtin/symbolic-ref.o
+BUILTIN_OBJS += builtin/tag.o
+BUILTIN_OBJS += builtin/tar-tree.o
+BUILTIN_OBJS += builtin/unpack-file.o
+BUILTIN_OBJS += builtin/unpack-objects.o
+BUILTIN_OBJS += builtin/update-index.o
+BUILTIN_OBJS += builtin/update-ref.o
+BUILTIN_OBJS += builtin/update-server-info.o
+BUILTIN_OBJS += builtin/upload-archive.o
+BUILTIN_OBJS += builtin/var.o
+BUILTIN_OBJS += builtin/verify-pack.o
+BUILTIN_OBJS += builtin/verify-tag.o
+BUILTIN_OBJS += builtin/write-tree.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 EXTLIBS =
@@ -1487,8 +1487,8 @@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
 		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
 
-builtin-help.o: common-cmds.h
-builtin-help.s builtin-help.o: ALL_CFLAGS += \
+builtin/help.o: common-cmds.h
+builtin/help.s builtin/help.o: ALL_CFLAGS += \
 	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
 	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
 	'-DGIT_INFO_PATH="$(infodir_SQ)"'
@@ -1741,17 +1741,17 @@ else
 # gcc detects!
 
 $(GIT_OBJS): $(LIB_H)
-builtin-branch.o builtin-checkout.o builtin-clone.o builtin-reset.o branch.o transport.o: branch.h
-builtin-bundle.o bundle.o transport.o: bundle.h
-builtin-bisect--helper.o builtin-rev-list.o bisect.o: bisect.h
-builtin-clone.o builtin-fetch-pack.o transport.o: fetch-pack.h
-builtin-grep.o: thread-utils.h
-builtin-send-pack.o transport.o: send-pack.h
-builtin-log.o builtin-shortlog.o: shortlog.h
-builtin-prune.o builtin-reflog.o reachable.o: reachable.h
-builtin-commit.o builtin-revert.o wt-status.o: wt-status.h
-builtin-tar-tree.o archive-tar.o: tar.h
-builtin-pack-objects.o: thread-utils.h
+builtin/branch.o builtin/checkout.o builtin/clone.o builtin/reset.o branch.o transport.o: branch.h
+builtin/bundle.o bundle.o transport.o: bundle.h
+builtin/bisect--helper.o builtin/rev-list.o bisect.o: bisect.h
+builtin/clone.o builtin/fetch-pack.o transport.o: fetch-pack.h
+builtin/grep.o: thread-utils.h
+builtin/send-pack.o transport.o: send-pack.h
+builtin/log.o builtin/shortlog.o: shortlog.h
+builtin/prune.o builtin/reflog.o reachable.o: reachable.h
+builtin/commit.o builtin/revert.o wt-status.o: wt-status.h
+builtin/tar-tree.o archive-tar.o: tar.h
+builtin/pack-objects.o: thread-utils.h
 http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
 http.o http-walker.o http-push.o remote-curl.o: http.h
 
@@ -1765,7 +1765,7 @@ exec_cmd.s exec_cmd.o: ALL_CFLAGS += \
 	'-DBINDIR="$(bindir_relative_SQ)"' \
 	'-DPREFIX="$(prefix_SQ)"'
 
-builtin-init-db.s builtin-init-db.o: ALL_CFLAGS += \
+builtin/init-db.s builtin/init-db.o: ALL_CFLAGS += \
 	-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
 
 config.s config.o: ALL_CFLAGS += -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
@@ -2063,7 +2063,7 @@ distclean: clean
 
 clean:
 	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
-		$(LIB_FILE) $(XDIFF_LIB)
+		builtin/*.o $(LIB_FILE) $(XDIFF_LIB)
 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
 	$(RM) $(TEST_PROGRAMS)
 	$(RM) -r bin-wrappers
diff --git a/builtin-add.c b/builtin/add.c
index 2705f8d05..2705f8d05 100644
--- a/builtin-add.c
+++ b/builtin/add.c
diff --git a/builtin-annotate.c b/builtin/annotate.c
index fc43eed36..fc43eed36 100644
--- a/builtin-annotate.c
+++ b/builtin/annotate.c
diff --git a/builtin-apply.c b/builtin/apply.c
index 3af4ae0c2..3af4ae0c2 100644
--- a/builtin-apply.c
+++ b/builtin/apply.c
diff --git a/builtin-archive.c b/builtin/archive.c
index 6a887f5a9..6a887f5a9 100644
--- a/builtin-archive.c
+++ b/builtin/archive.c
diff --git a/builtin-bisect--helper.c b/builtin/bisect--helper.c
index 5b226399e..5b226399e 100644
--- a/builtin-bisect--helper.c
+++ b/builtin/bisect--helper.c
diff --git a/builtin-blame.c b/builtin/blame.c
index 10f7eacf6..10f7eacf6 100644
--- a/builtin-blame.c
+++ b/builtin/blame.c
diff --git a/builtin-branch.c b/builtin/branch.c
index 6cf7e721e..6cf7e721e 100644
--- a/builtin-branch.c
+++ b/builtin/branch.c
diff --git a/builtin-bundle.c b/builtin/bundle.c
index 2006cc5cd..2006cc5cd 100644
--- a/builtin-bundle.c
+++ b/builtin/bundle.c
diff --git a/builtin-cat-file.c b/builtin/cat-file.c
index a933eaa04..a933eaa04 100644
--- a/builtin-cat-file.c
+++ b/builtin/cat-file.c
diff --git a/builtin-check-attr.c b/builtin/check-attr.c
index 3016d29ca..3016d29ca 100644
--- a/builtin-check-attr.c
+++ b/builtin/check-attr.c
diff --git a/builtin-check-ref-format.c b/builtin/check-ref-format.c
index b106c65d8..b106c65d8 100644
--- a/builtin-check-ref-format.c
+++ b/builtin/check-ref-format.c
diff --git a/builtin-checkout-index.c b/builtin/checkout-index.c
index a7a5ee10f..a7a5ee10f 100644
--- a/builtin-checkout-index.c
+++ b/builtin/checkout-index.c
diff --git a/builtin-checkout.c b/builtin/checkout.c
index acefaaf41..acefaaf41 100644
--- a/builtin-checkout.c
+++ b/builtin/checkout.c
diff --git a/builtin-clean.c b/builtin/clean.c
index fac64e6cd..fac64e6cd 100644
--- a/builtin-clean.c
+++ b/builtin/clean.c
diff --git a/builtin-clone.c b/builtin/clone.c
index 58bacbd55..58bacbd55 100644
--- a/builtin-clone.c
+++ b/builtin/clone.c
diff --git a/builtin-commit-tree.c b/builtin/commit-tree.c
index 90dac349a..90dac349a 100644
--- a/builtin-commit-tree.c
+++ b/builtin/commit-tree.c
diff --git a/builtin-commit.c b/builtin/commit.c
index f4c73442c..f4c73442c 100644
--- a/builtin-commit.c
+++ b/builtin/commit.c
diff --git a/builtin-config.c b/builtin/config.c
index 4bc46b15f..4bc46b15f 100644
--- a/builtin-config.c
+++ b/builtin/config.c
diff --git a/builtin-count-objects.c b/builtin/count-objects.c
index 2bdd8ebde..2bdd8ebde 100644
--- a/builtin-count-objects.c
+++ b/builtin/count-objects.c
diff --git a/builtin-describe.c b/builtin/describe.c
index 71be2a936..71be2a936 100644
--- a/builtin-describe.c
+++ b/builtin/describe.c
diff --git a/builtin-diff-files.c b/builtin/diff-files.c
index 5b64011de..5b64011de 100644
--- a/builtin-diff-files.c
+++ b/builtin/diff-files.c
diff --git a/builtin-diff-index.c b/builtin/diff-index.c
index 04837494f..04837494f 100644
--- a/builtin-diff-index.c
+++ b/builtin/diff-index.c
diff --git a/builtin-diff-tree.c b/builtin/diff-tree.c
index 2380c2195..2380c2195 100644
--- a/builtin-diff-tree.c
+++ b/builtin/diff-tree.c
diff --git a/builtin-diff.c b/builtin/diff.c
index ffcdd055c..ffcdd055c 100644
--- a/builtin-diff.c
+++ b/builtin/diff.c
diff --git a/builtin-fast-export.c b/builtin/fast-export.c
index b0a4029c9..b0a4029c9 100644
--- a/builtin-fast-export.c
+++ b/builtin/fast-export.c
diff --git a/builtin-fetch-pack.c b/builtin/fetch-pack.c
index dbd8b7bcc..dbd8b7bcc 100644
--- a/builtin-fetch-pack.c
+++ b/builtin/fetch-pack.c
diff --git a/builtin-fetch.c b/builtin/fetch.c
index b6c5b344b..b6c5b344b 100644
--- a/builtin-fetch.c
+++ b/builtin/fetch.c
diff --git a/builtin-fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 9d524000b..9d524000b 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
diff --git a/builtin-for-each-ref.c b/builtin/for-each-ref.c
index 62be1bbfd..62be1bbfd 100644
--- a/builtin-for-each-ref.c
+++ b/builtin/for-each-ref.c
diff --git a/builtin-fsck.c b/builtin/fsck.c
index 0929c7f24..0929c7f24 100644
--- a/builtin-fsck.c
+++ b/builtin/fsck.c
diff --git a/builtin-gc.c b/builtin/gc.c
index c304638b7..c304638b7 100644
--- a/builtin-gc.c
+++ b/builtin/gc.c
diff --git a/builtin-grep.c b/builtin/grep.c
index 40b9a9312..40b9a9312 100644
--- a/builtin-grep.c
+++ b/builtin/grep.c
diff --git a/builtin-hash-object.c b/builtin/hash-object.c
index 080af1a01..080af1a01 100644
--- a/builtin-hash-object.c
+++ b/builtin/hash-object.c
diff --git a/builtin-help.c b/builtin/help.c
index 3182a2bec..3182a2bec 100644
--- a/builtin-help.c
+++ b/builtin/help.c
diff --git a/builtin-index-pack.c b/builtin/index-pack.c
index b4cf8c53e..b4cf8c53e 100644
--- a/builtin-index-pack.c
+++ b/builtin/index-pack.c
diff --git a/builtin-init-db.c b/builtin/init-db.c
index aae7a4d7e..aae7a4d7e 100644
--- a/builtin-init-db.c
+++ b/builtin/init-db.c
diff --git a/builtin-log.c b/builtin/log.c
index e0d5caa61..e0d5caa61 100644
--- a/builtin-log.c
+++ b/builtin/log.c
diff --git a/builtin-ls-files.c b/builtin/ls-files.c
index b06506139..b06506139 100644
--- a/builtin-ls-files.c
+++ b/builtin/ls-files.c
diff --git a/builtin-ls-remote.c b/builtin/ls-remote.c
index 70f5622d9..70f5622d9 100644
--- a/builtin-ls-remote.c
+++ b/builtin/ls-remote.c
diff --git a/builtin-ls-tree.c b/builtin/ls-tree.c
index 4484185af..4484185af 100644
--- a/builtin-ls-tree.c
+++ b/builtin/ls-tree.c
diff --git a/builtin-mailinfo.c b/builtin/mailinfo.c
index ce2ef6bed..ce2ef6bed 100644
--- a/builtin-mailinfo.c
+++ b/builtin/mailinfo.c
diff --git a/builtin-mailsplit.c b/builtin/mailsplit.c
index 207e358ed..207e358ed 100644
--- a/builtin-mailsplit.c
+++ b/builtin/mailsplit.c
diff --git a/builtin-merge-base.c b/builtin/merge-base.c
index 54e7ec223..54e7ec223 100644
--- a/builtin-merge-base.c
+++ b/builtin/merge-base.c
diff --git a/builtin-merge-file.c b/builtin/merge-file.c
index 1e70073a7..1e70073a7 100644
--- a/builtin-merge-file.c
+++ b/builtin/merge-file.c
diff --git a/builtin-merge-index.c b/builtin/merge-index.c
index 2c4cf5e55..2c4cf5e55 100644
--- a/builtin-merge-index.c
+++ b/builtin/merge-index.c
diff --git a/builtin-merge-ours.c b/builtin/merge-ours.c
index 684411694..684411694 100644
--- a/builtin-merge-ours.c
+++ b/builtin/merge-ours.c
diff --git a/builtin-merge-recursive.c b/builtin/merge-recursive.c
index d8875d589..d8875d589 100644
--- a/builtin-merge-recursive.c
+++ b/builtin/merge-recursive.c
diff --git a/builtin-merge-tree.c b/builtin/merge-tree.c
index a4a4f2ce4..a4a4f2ce4 100644
--- a/builtin-merge-tree.c
+++ b/builtin/merge-tree.c
diff --git a/builtin-merge.c b/builtin/merge.c
index 3aaec7bed..3aaec7bed 100644
--- a/builtin-merge.c
+++ b/builtin/merge.c
diff --git a/builtin-mktag.c b/builtin/mktag.c
index 1cb0f3f2a..1cb0f3f2a 100644
--- a/builtin-mktag.c
+++ b/builtin/mktag.c
diff --git a/builtin-mktree.c b/builtin/mktree.c
index 098395fda..098395fda 100644
--- a/builtin-mktree.c
+++ b/builtin/mktree.c
diff --git a/builtin-mv.c b/builtin/mv.c
index c07f53b34..c07f53b34 100644
--- a/builtin-mv.c
+++ b/builtin/mv.c
diff --git a/builtin-name-rev.c b/builtin/name-rev.c
index 06a38ac8c..06a38ac8c 100644
--- a/builtin-name-rev.c
+++ b/builtin/name-rev.c
diff --git a/builtin-pack-objects.c b/builtin/pack-objects.c
index 97802585e..97802585e 100644
--- a/builtin-pack-objects.c
+++ b/builtin/pack-objects.c
diff --git a/builtin-pack-redundant.c b/builtin/pack-redundant.c
index 41e1615a2..41e1615a2 100644
--- a/builtin-pack-redundant.c
+++ b/builtin/pack-redundant.c
diff --git a/builtin-pack-refs.c b/builtin/pack-refs.c
index 091860b2e..091860b2e 100644
--- a/builtin-pack-refs.c
+++ b/builtin/pack-refs.c
diff --git a/builtin-patch-id.c b/builtin/patch-id.c
index af0911e4b..af0911e4b 100644
--- a/builtin-patch-id.c
+++ b/builtin/patch-id.c
diff --git a/builtin-prune-packed.c b/builtin/prune-packed.c
index f9463deec..f9463deec 100644
--- a/builtin-prune-packed.c
+++ b/builtin/prune-packed.c
diff --git a/builtin-prune.c b/builtin/prune.c
index 81f915ec3..81f915ec3 100644
--- a/builtin-prune.c
+++ b/builtin/prune.c
diff --git a/builtin-push.c b/builtin/push.c
index f7bc2b292..f7bc2b292 100644
--- a/builtin-push.c
+++ b/builtin/push.c
diff --git a/builtin-read-tree.c b/builtin/read-tree.c
index 8bdcab113..8bdcab113 100644
--- a/builtin-read-tree.c
+++ b/builtin/read-tree.c
diff --git a/builtin-receive-pack.c b/builtin/receive-pack.c
index 0559fcc87..0559fcc87 100644
--- a/builtin-receive-pack.c
+++ b/builtin/receive-pack.c
diff --git a/builtin-reflog.c b/builtin/reflog.c
index 64e45bd81..64e45bd81 100644
--- a/builtin-reflog.c
+++ b/builtin/reflog.c
diff --git a/builtin-remote.c b/builtin/remote.c
index 277765b86..277765b86 100644
--- a/builtin-remote.c
+++ b/builtin/remote.c
diff --git a/builtin-replace.c b/builtin/replace.c
index fe3a647a3..fe3a647a3 100644
--- a/builtin-replace.c
+++ b/builtin/replace.c
diff --git a/builtin-rerere.c b/builtin/rerere.c
index 34f9acee9..34f9acee9 100644
--- a/builtin-rerere.c
+++ b/builtin/rerere.c
diff --git a/builtin-reset.c b/builtin/reset.c
index 0f5022eed..0f5022eed 100644
--- a/builtin-reset.c
+++ b/builtin/reset.c
diff --git a/builtin-rev-list.c b/builtin/rev-list.c
index 5679170e8..5679170e8 100644
--- a/builtin-rev-list.c
+++ b/builtin/rev-list.c
diff --git a/builtin-rev-parse.c b/builtin/rev-parse.c
index 8fbf9d0db..8fbf9d0db 100644
--- a/builtin-rev-parse.c
+++ b/builtin/rev-parse.c
diff --git a/builtin-revert.c b/builtin/revert.c
index eff52687a..eff52687a 100644
--- a/builtin-revert.c
+++ b/builtin/revert.c
diff --git a/builtin-rm.c b/builtin/rm.c
index f3772c84d..f3772c84d 100644
--- a/builtin-rm.c
+++ b/builtin/rm.c
diff --git a/builtin-send-pack.c b/builtin/send-pack.c
index 6019eac91..6019eac91 100644
--- a/builtin-send-pack.c
+++ b/builtin/send-pack.c
diff --git a/builtin-shortlog.c b/builtin/shortlog.c
index 06320f528..06320f528 100644
--- a/builtin-shortlog.c
+++ b/builtin/shortlog.c
diff --git a/builtin-show-branch.c b/builtin/show-branch.c
index e20fcf3e9..e20fcf3e9 100644
--- a/builtin-show-branch.c
+++ b/builtin/show-branch.c
diff --git a/builtin-show-ref.c b/builtin/show-ref.c
index 17ada88df..17ada88df 100644
--- a/builtin-show-ref.c
+++ b/builtin/show-ref.c
diff --git a/builtin-stripspace.c b/builtin/stripspace.c
index 4d3b93fed..4d3b93fed 100644
--- a/builtin-stripspace.c
+++ b/builtin/stripspace.c
diff --git a/builtin-symbolic-ref.c b/builtin/symbolic-ref.c
index ca855a5eb..ca855a5eb 100644
--- a/builtin-symbolic-ref.c
+++ b/builtin/symbolic-ref.c
diff --git a/builtin-tag.c b/builtin/tag.c
index 4ef1c4f50..4ef1c4f50 100644
--- a/builtin-tag.c
+++ b/builtin/tag.c
diff --git a/builtin-tar-tree.c b/builtin/tar-tree.c
index 3f1e7012d..3f1e7012d 100644
--- a/builtin-tar-tree.c
+++ b/builtin/tar-tree.c
diff --git a/builtin-unpack-file.c b/builtin/unpack-file.c
index 608590ada..608590ada 100644
--- a/builtin-unpack-file.c
+++ b/builtin/unpack-file.c
diff --git a/builtin-unpack-objects.c b/builtin/unpack-objects.c
index 685566e0b..685566e0b 100644
--- a/builtin-unpack-objects.c
+++ b/builtin/unpack-objects.c
diff --git a/builtin-update-index.c b/builtin/update-index.c
index 3ab214d24..3ab214d24 100644
--- a/builtin-update-index.c
+++ b/builtin/update-index.c
diff --git a/builtin-update-ref.c b/builtin/update-ref.c
index 76ba1d588..76ba1d588 100644
--- a/builtin-update-ref.c
+++ b/builtin/update-ref.c
diff --git a/builtin-update-server-info.c b/builtin/update-server-info.c
index 2b3fddcc6..2b3fddcc6 100644
--- a/builtin-update-server-info.c
+++ b/builtin/update-server-info.c
diff --git a/builtin-upload-archive.c b/builtin/upload-archive.c
index 73f788ef2..73f788ef2 100644
--- a/builtin-upload-archive.c
+++ b/builtin/upload-archive.c
diff --git a/builtin-var.c b/builtin/var.c
index 70fdb4dec..70fdb4dec 100644
--- a/builtin-var.c
+++ b/builtin/var.c
diff --git a/builtin-verify-pack.c b/builtin/verify-pack.c
index b6079ae6c..b6079ae6c 100644
--- a/builtin-verify-pack.c
+++ b/builtin/verify-pack.c
diff --git a/builtin-verify-tag.c b/builtin/verify-tag.c
index 9f482c29f..9f482c29f 100644
--- a/builtin-verify-tag.c
+++ b/builtin/verify-tag.c
diff --git a/builtin-write-tree.c b/builtin/write-tree.c
index b223af416..b223af416 100644
--- a/builtin-write-tree.c
+++ b/builtin/write-tree.c