diff options
-rw-r--r-- | .gitignore | 33 | ||||
-rw-r--r-- | Documentation/RelNotes/2.9.0.txt | 298 | ||||
-rw-r--r-- | Documentation/config.txt | 24 | ||||
-rw-r--r-- | Documentation/diff-config.txt | 10 | ||||
-rw-r--r-- | Documentation/diff-options.txt | 2 | ||||
-rw-r--r-- | Documentation/git-clone.txt | 6 | ||||
-rw-r--r-- | Documentation/git-for-each-ref.txt | 2 | ||||
-rw-r--r-- | Documentation/git-merge.txt | 1 | ||||
-rw-r--r-- | Documentation/git-p4.txt | 11 | ||||
-rw-r--r-- | Documentation/git-pull.txt | 9 | ||||
-rw-r--r-- | Documentation/git-rebase.txt | 6 | ||||
-rw-r--r-- | Documentation/git-submodule.txt | 7 | ||||
-rw-r--r-- | Documentation/git-worktree.txt | 8 | ||||
-rw-r--r-- | Documentation/gitcredentials.txt | 5 | ||||
-rw-r--r-- | Documentation/merge-options.txt | 8 | ||||
-rw-r--r-- | Documentation/pretty-options.txt | 14 | ||||
-rw-r--r-- | Documentation/technical/api-config.txt | 7 | ||||
-rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
-rw-r--r-- | Makefile | 34 | ||||
-rw-r--r-- | README.md | 7 | ||||
l--------- | RelNotes | 2 | ||||
-rw-r--r-- | branch.c | 23 | ||||
-rw-r--r-- | branch.h | 7 | ||||
-rw-r--r-- | builtin/apply.c | 32 | ||||
-rw-r--r-- | builtin/branch.c | 44 | ||||
-rw-r--r-- | builtin/checkout.c | 3 | ||||
-rw-r--r-- | builtin/clone.c | 19 | ||||
-rw-r--r-- | builtin/commit.c | 7 | ||||
-rw-r--r-- | builtin/diff.c | 1 | ||||
-rw-r--r-- | builtin/fetch.c | 2 | ||||
-rw-r--r-- | builtin/fsck.c | 3 | ||||
-rw-r--r-- | builtin/init-db.c | 45 | ||||
-rw-r--r-- | builtin/log.c | 17 | ||||
-rw-r--r-- | builtin/merge.c | 25 | ||||
-rw-r--r-- | builtin/mv.c | 21 | ||||
-rw-r--r-- | builtin/notes.c | 5 | ||||
-rw-r--r-- | builtin/pull.c | 36 | ||||
-rw-r--r-- | builtin/receive-pack.c | 55 | ||||
-rw-r--r-- | builtin/replace.c | 1 | ||||
-rw-r--r-- | builtin/submodule--helper.c | 370 | ||||
-rw-r--r-- | builtin/tag.c | 28 | ||||
-rw-r--r-- | builtin/verify-tag.c | 61 | ||||
-rw-r--r-- | builtin/worktree.c | 29 | ||||
-rw-r--r-- | bundle.c | 23 | ||||
-rw-r--r-- | cache.h | 40 | ||||
-rw-r--r-- | commit.h | 1 | ||||
-rw-r--r-- | compat/apple-common-crypto.h | 16 | ||||
-rw-r--r-- | compat/win32mmap.c | 31 | ||||
-rw-r--r-- | config.c | 32 | ||||
-rw-r--r-- | config.mak.uname | 1 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | contrib/completion/git-completion.bash | 7 | ||||
-rw-r--r-- | credential-cache.c | 1 | ||||
-rw-r--r-- | credential.c | 9 | ||||
-rw-r--r-- | diff.c | 5 | ||||
-rw-r--r-- | diff.h | 1 | ||||
-rw-r--r-- | environment.c | 23 | ||||
-rw-r--r-- | fetch-pack.c | 4 | ||||
-rwxr-xr-x | git-add--interactive.perl | 12 | ||||
-rw-r--r-- | git-compat-util.h | 3 | ||||
-rwxr-xr-x | git-merge-octopus.sh | 6 | ||||
-rw-r--r-- | git-mergetool--lib.sh | 25 | ||||
-rwxr-xr-x | git-p4.py | 9 | ||||
-rw-r--r-- | git-rebase--interactive.sh | 3 | ||||
-rwxr-xr-x | git-rebase.sh | 7 | ||||
-rwxr-xr-x | git-send-email.perl | 6 | ||||
-rwxr-xr-x | git-submodule.sh | 109 | ||||
-rw-r--r-- | gpg-interface.c | 2 | ||||
-rw-r--r-- | http-backend.c | 4 | ||||
-rw-r--r-- | http.c | 5 | ||||
-rw-r--r-- | ident.c | 16 | ||||
-rw-r--r-- | imap-send.c | 32 | ||||
-rw-r--r-- | log-tree.c | 1 | ||||
-rw-r--r-- | mergetools/examdiff | 18 | ||||
-rw-r--r-- | mergetools/winmerge | 21 | ||||
-rw-r--r-- | path.c | 10 | ||||
-rw-r--r-- | pretty.c | 90 | ||||
-rw-r--r-- | quote.c | 13 | ||||
-rw-r--r-- | quote.h | 3 | ||||
-rw-r--r-- | refs.c | 149 | ||||
-rw-r--r-- | refs.h | 9 | ||||
-rw-r--r-- | refs/files-backend.c | 442 | ||||
-rw-r--r-- | refs/refs-internal.h | 15 | ||||
-rw-r--r-- | rerere.c | 626 | ||||
-rw-r--r-- | rerere.h | 4 | ||||
-rw-r--r-- | revision.c | 14 | ||||
-rw-r--r-- | revision.h | 2 | ||||
-rw-r--r-- | run-command.c | 22 | ||||
-rw-r--r-- | run-command.h | 11 | ||||
-rw-r--r-- | send-pack.c | 7 | ||||
-rw-r--r-- | setup.c | 146 | ||||
-rw-r--r-- | strbuf.c | 6 | ||||
-rw-r--r-- | strbuf.h | 6 | ||||
-rw-r--r-- | submodule-config.c | 19 | ||||
-rw-r--r-- | submodule-config.h | 2 | ||||
-rw-r--r-- | submodule.c | 37 | ||||
-rw-r--r-- | submodule.h | 18 | ||||
-rw-r--r-- | t/helper/.gitignore | 33 | ||||
-rw-r--r-- | t/helper/test-chmtime.c (renamed from test-chmtime.c) | 0 | ||||
-rw-r--r-- | t/helper/test-config.c (renamed from test-config.c) | 0 | ||||
-rw-r--r-- | t/helper/test-ctype.c (renamed from test-ctype.c) | 0 | ||||
-rw-r--r-- | t/helper/test-date.c (renamed from test-date.c) | 0 | ||||
-rw-r--r-- | t/helper/test-delta.c (renamed from test-delta.c) | 0 | ||||
-rw-r--r-- | t/helper/test-dump-cache-tree.c (renamed from test-dump-cache-tree.c) | 0 | ||||
-rw-r--r-- | t/helper/test-dump-split-index.c (renamed from test-dump-split-index.c) | 0 | ||||
-rw-r--r-- | t/helper/test-dump-untracked-cache.c (renamed from test-dump-untracked-cache.c) | 0 | ||||
-rw-r--r-- | t/helper/test-fake-ssh.c (renamed from test-fake-ssh.c) | 0 | ||||
-rw-r--r-- | t/helper/test-genrandom.c (renamed from test-genrandom.c) | 0 | ||||
-rw-r--r-- | t/helper/test-hashmap.c (renamed from test-hashmap.c) | 0 | ||||
-rw-r--r-- | t/helper/test-index-version.c (renamed from test-index-version.c) | 0 | ||||
-rw-r--r-- | t/helper/test-line-buffer.c (renamed from test-line-buffer.c) | 0 | ||||
-rw-r--r-- | t/helper/test-match-trees.c (renamed from test-match-trees.c) | 0 | ||||
-rw-r--r-- | t/helper/test-mergesort.c (renamed from test-mergesort.c) | 0 | ||||
-rw-r--r-- | t/helper/test-mktemp.c (renamed from test-mktemp.c) | 0 | ||||
-rw-r--r-- | t/helper/test-parse-options.c (renamed from test-parse-options.c) | 0 | ||||
-rw-r--r-- | t/helper/test-path-utils.c (renamed from test-path-utils.c) | 0 | ||||
-rw-r--r-- | t/helper/test-prio-queue.c (renamed from test-prio-queue.c) | 0 | ||||
-rw-r--r-- | t/helper/test-read-cache.c (renamed from test-read-cache.c) | 0 | ||||
-rw-r--r-- | t/helper/test-regex.c (renamed from test-regex.c) | 0 | ||||
-rw-r--r-- | t/helper/test-revision-walking.c (renamed from test-revision-walking.c) | 0 | ||||
-rw-r--r-- | t/helper/test-run-command.c (renamed from test-run-command.c) | 0 | ||||
-rw-r--r-- | t/helper/test-scrap-cache-tree.c (renamed from test-scrap-cache-tree.c) | 0 | ||||
-rw-r--r-- | t/helper/test-sha1-array.c (renamed from test-sha1-array.c) | 0 | ||||
-rw-r--r-- | t/helper/test-sha1.c (renamed from test-sha1.c) | 0 | ||||
-rwxr-xr-x | t/helper/test-sha1.sh (renamed from test-sha1.sh) | 4 | ||||
-rw-r--r-- | t/helper/test-sigchain.c (renamed from test-sigchain.c) | 0 | ||||
-rw-r--r-- | t/helper/test-string-list.c (renamed from test-string-list.c) | 0 | ||||
-rw-r--r-- | t/helper/test-submodule-config.c (renamed from test-submodule-config.c) | 0 | ||||
-rw-r--r-- | t/helper/test-subprocess.c (renamed from test-subprocess.c) | 0 | ||||
-rw-r--r-- | t/helper/test-svn-fe.c (renamed from test-svn-fe.c) | 0 | ||||
-rw-r--r-- | t/helper/test-urlmatch-normalization.c (renamed from test-urlmatch-normalization.c) | 0 |