summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Documentation/CodingGuidelines8
-rw-r--r--Documentation/Makefile3
-rw-r--r--Documentation/RelNotes/1.7.11.6.txt84
-rw-r--r--Documentation/RelNotes/1.7.11.7.txt46
-rw-r--r--Documentation/RelNotes/1.7.12.1.txt134
-rw-r--r--Documentation/asciidoc.conf4
-rw-r--r--Documentation/config.txt5
-rw-r--r--Documentation/git-checkout.txt18
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-config.txt12
-rw-r--r--Documentation/git-credential-cache--daemon.txt2
-rw-r--r--Documentation/git-credential-cache.txt2
-rw-r--r--Documentation/git-credential-store.txt2
-rw-r--r--Documentation/git-describe.txt4
-rw-r--r--Documentation/git-fast-import.txt8
-rw-r--r--Documentation/git-filter-branch.txt22
-rw-r--r--Documentation/git-for-each-ref.txt7
-rw-r--r--Documentation/git-format-patch.txt11
-rw-r--r--Documentation/git-fsck.txt4
-rw-r--r--Documentation/git-log.txt6
-rw-r--r--Documentation/git-lost-found.txt3
-rw-r--r--Documentation/git-ls-remote.txt5
-rw-r--r--Documentation/git-pack-refs.txt19
-rw-r--r--Documentation/git-pull.txt1
-rw-r--r--Documentation/git-remote.txt3
-rw-r--r--Documentation/git-replace.txt5
-rw-r--r--Documentation/git-shortlog.txt3
-rw-r--r--Documentation/git-submodule.txt9
-rw-r--r--Documentation/git-tag.txt5
-rw-r--r--Documentation/git.txt67
-rw-r--r--Documentation/gitcli.txt27
-rw-r--r--Documentation/gitcore-tutorial.txt9
-rw-r--r--Documentation/gittutorial.txt8
-rw-r--r--Documentation/pretty-formats.txt3
-rw-r--r--Documentation/pretty-options.txt4
-rw-r--r--Documentation/rev-list-options.txt44
-rw-r--r--Documentation/revisions.txt7
-rw-r--r--Documentation/technical/pack-protocol.txt6
-rw-r--r--Documentation/user-manual.conf2
-rw-r--r--Documentation/user-manual.txt9
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile36
l---------RelNotes2
-rw-r--r--attr.c5
-rw-r--r--builtin.h2
-rw-r--r--builtin/apply.c69
-rw-r--r--builtin/blame.c18
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/check-attr.c2
-rw-r--r--builtin/checkout.c3
-rw-r--r--builtin/commit.c17
-rw-r--r--builtin/config.c12
-rw-r--r--builtin/diff.c11
-rw-r--r--builtin/fetch-pack.c20
-rw-r--r--builtin/for-each-ref.c4
-rw-r--r--builtin/log.c4
-rw-r--r--builtin/ls-remote.c2
-rw-r--r--builtin/mailinfo.c4
-rw-r--r--builtin/merge.c3
-rw-r--r--builtin/prune.c3
-rw-r--r--builtin/receive-pack.c9
-rw-r--r--builtin/remote.c6
-rw-r--r--builtin/rev-parse.c16
-rw-r--r--builtin/revert.c2
-rw-r--r--builtin/send-pack.c15
-rw-r--r--cache.h5
-rw-r--r--combine-diff.c4
-rw-r--r--command-list.txt3
-rw-r--r--compat/precompose_utf8.c44
-rw-r--r--config.c10
-rw-r--r--connect.c45
-rw-r--r--contrib/ciabot/INSTALL54
-rw-r--r--contrib/ciabot/README3
-rwxr-xr-xcontrib/ciabot/ciabot.py179
-rwxr-xr-xcontrib/ciabot/ciabot.sh133
-rw-r--r--contrib/completion/git-completion.bash16
-rwxr-xr-xcontrib/git-jump/git-jump4
-rw-r--r--diff-lib.c20
-rw-r--r--diff-no-index.c5
-rw-r--r--diff.c21
-rw-r--r--diff.h7
-rw-r--r--diffcore-rename.c2
-rw-r--r--diffcore.h2
-rw-r--r--dir.c6
-rw-r--r--fsck.c8
-rw-r--r--git-compat-util.h6
-rwxr-xr-xgit-mergetool.sh581
-rw-r--r--git-rebase--interactive.sh3
-rwxr-xr-xgit-send-email.perl28
-rw-r--r--git-sh-setup.sh4
-rwxr-xr-xgit-stash.sh1
-rwxr-xr-xgit-submodule.sh35
-rwxr-xr-xgitk-git/gitk17
-rwxr-xr-xgitweb/gitweb.perl5
-rw-r--r--http.c53
-rw-r--r--http.h1
-rw-r--r--ident.c6
-rw-r--r--merge-recursive.c22
-rw-r--r--notes-merge.c6
-rw-r--r--patch-ids.c3
-rw-r--r--read-cache.c8
-rw-r--r--remote-curl.c23
-rw-r--r--revision.c39
-rw-r--r--revision.h6
-rw-r--r--run-command.c15
-rw-r--r--sequencer.c6
-rw-r--r--setup.c8
-rw-r--r--sha1_file.c26
-rw-r--r--submodule.c3
-rw-r--r--t/README9
-rw-r--r--t/lib-httpd.sh39
-rw-r--r--t/lib-httpd/apache.conf25
-rw-r--r--t/perf/.gitignore5
-rw-r--r--t/perf/perf-lib.sh2
-rwxr-xr-xt/t0003-attributes.sh10
-rwxr-xr-xt/t0050-filesystem.sh64
-rwxr-xr-xt/t0070-fundamental.sh5
-rwxr-xr-xt/t1450-fsck.sh26
-rwxr-xr-xt/t1506-rev-parse-diagnosis.sh14
-rwxr-xr-xt/t2107-update-index-basic.sh19
-rwxr-xr-xt/t3401-rebase-partial.sh18
-rwxr-xr-xt/t3508-cherry-pick-many-commits.sh15
-rwxr-xr-xt/t3910-mac-os-precompose.sh281
-rwxr-xr-xt/t4022-diff-rewrite.sh30
-rwxr-xr-xt/t4054-diff-bogus-tree.sh83
-rwxr-xr-xt/t4103-apply-binary.sh54
-rwxr-xr-xt/t4202-log.sh17
-rwxr-xr-xt/t5400-send-pack.sh35
-rwxr-xr-xt/t5505-remote.sh4
-rwxr-xr-xt/t5540-http-push.sh19
-rwxr-xr-xt/t5541-http-push.sh26
-rwxr-xr-x