summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore33
-rw-r--r--Documentation/RelNotes/2.9.0.txt298
-rw-r--r--Documentation/config.txt24
-rw-r--r--Documentation/diff-config.txt10
-rw-r--r--Documentation/diff-options.txt2
-rw-r--r--Documentation/git-clone.txt6
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-merge.txt1
-rw-r--r--Documentation/git-p4.txt11
-rw-r--r--Documentation/git-pull.txt9
-rw-r--r--Documentation/git-rebase.txt6
-rw-r--r--Documentation/git-submodule.txt7
-rw-r--r--Documentation/git-worktree.txt8
-rw-r--r--Documentation/gitcredentials.txt5
-rw-r--r--Documentation/merge-options.txt8
-rw-r--r--Documentation/pretty-options.txt14
-rw-r--r--Documentation/technical/api-config.txt7
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile34
-rw-r--r--README.md7
l---------RelNotes2
-rw-r--r--branch.c23
-rw-r--r--branch.h7
-rw-r--r--builtin/apply.c32
-rw-r--r--builtin/branch.c44
-rw-r--r--builtin/checkout.c3
-rw-r--r--builtin/clone.c19
-rw-r--r--builtin/commit.c7
-rw-r--r--builtin/diff.c1
-rw-r--r--builtin/fetch.c2
-rw-r--r--builtin/fsck.c3
-rw-r--r--builtin/init-db.c45
-rw-r--r--builtin/log.c17
-rw-r--r--builtin/merge.c25
-rw-r--r--builtin/mv.c21
-rw-r--r--builtin/notes.c5
-rw-r--r--builtin/pull.c36
-rw-r--r--builtin/receive-pack.c55
-rw-r--r--builtin/replace.c1
-rw-r--r--builtin/submodule--helper.c370
-rw-r--r--builtin/tag.c28
-rw-r--r--builtin/verify-tag.c61
-rw-r--r--builtin/worktree.c29
-rw-r--r--bundle.c23
-rw-r--r--cache.h40
-rw-r--r--commit.h1
-rw-r--r--compat/apple-common-crypto.h16
-rw-r--r--compat/win32mmap.c31
-rw-r--r--config.c32
-rw-r--r--config.mak.uname1
-rw-r--r--configure.ac4
-rw-r--r--contrib/completion/git-completion.bash7
-rw-r--r--credential-cache.c1
-rw-r--r--credential.c9
-rw-r--r--diff.c5
-rw-r--r--diff.h1
-rw-r--r--environment.c23
-rw-r--r--fetch-pack.c4
-rwxr-xr-xgit-add--interactive.perl12
-rw-r--r--git-compat-util.h3
-rwxr-xr-xgit-merge-octopus.sh6
-rw-r--r--git-mergetool--lib.sh25
-rwxr-xr-xgit-p4.py9
-rw-r--r--git-rebase--interactive.sh3
-rwxr-xr-xgit-rebase.sh7
-rwxr-xr-xgit-send-email.perl6
-rwxr-xr-xgit-submodule.sh109
-rw-r--r--gpg-interface.c2
-rw-r--r--http-backend.c4
-rw-r--r--http.c5
-rw-r--r--ident.c16
-rw-r--r--imap-send.c32
-rw-r--r--log-tree.c1
-rw-r--r--mergetools/examdiff18
-rw-r--r--mergetools/winmerge21
-rw-r--r--path.c10
-rw-r--r--pretty.c90
-rw-r--r--quote.c13
-rw-r--r--quote.h3
-rw-r--r--refs.c149
-rw-r--r--refs.h9
-rw-r--r--refs/files-backend.c442
-rw-r--r--refs/refs-internal.h15
-rw-r--r--rerere.c626
-rw-r--r--rerere.h4
-rw-r--r--revision.c14
-rw-r--r--revision.h2
-rw-r--r--run-command.c22
-rw-r--r--run-command.h11
-rw-r--r--send-pack.c7
-rw-r--r--setup.c146
-rw-r--r--strbuf.c6
-rw-r--r--strbuf.h6
-rw-r--r--submodule-config.c19
-rw-r--r--submodule-config.h2
-rw-r--r--submodule.c37
-rw-r--r--submodule.h18
-rw-r--r--t/helper/.gitignore33
-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-xt/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<