mirror of
https://github.com/git/git.git
synced 2026-03-13 10:23:30 +01:00
Conflicts: Makefile daemon.c exec_cmd.c exec_cmd.h fast-import.c git.c hash-object.c http-push.c imap-send.c index-pack.c merge-index.c merge-tree.c mktag.c mktree.c pack-redundant.c patch-id.c unpack-file.c update-server-info.c upload-pack.c var.c