summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--.mailmap9
-rw-r--r--Documentation/Makefile21
-rw-r--r--Documentation/RelNotes/1.7.12.txt136
-rw-r--r--Documentation/RelNotes/1.8.0.txt155
-rw-r--r--Documentation/asciidoc.conf4
-rw-r--r--Documentation/config.txt50
-rw-r--r--Documentation/git-apply.txt11
-rw-r--r--Documentation/git-checkout.txt6
-rw-r--r--Documentation/git-cherry-pick.txt5
-rw-r--r--Documentation/git-clone.txt19
-rw-r--r--Documentation/git-config.txt29
-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-credential.txt154
-rw-r--r--Documentation/git-daemon.txt16
-rw-r--r--Documentation/git-difftool.txt8
-rw-r--r--Documentation/git-grep.txt10
-rw-r--r--Documentation/git-mergetool.txt3
-rw-r--r--Documentation/git-p4.txt10
-rw-r--r--Documentation/git-rebase.txt52
-rw-r--r--Documentation/git-rev-parse.txt6
-rw-r--r--Documentation/git-submodule.txt9
-rw-r--r--Documentation/git.txt65
-rw-r--r--Documentation/gitattributes.txt2
-rw-r--r--Documentation/gitignore.txt4
-rw-r--r--Documentation/revisions.txt7
-rw-r--r--Documentation/technical/api-credentials.txt39
-rw-r--r--Documentation/user-manual.conf2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile322
l---------RelNotes2
-rw-r--r--archive.c38
-rw-r--r--attr.c10
-rw-r--r--branch.c38
-rw-r--r--builtin.h4
-rw-r--r--builtin/add.c26
-rw-r--r--builtin/apply.c634
-rw-r--r--builtin/archive.c12
-rw-r--r--builtin/bisect--helper.c6
-rw-r--r--builtin/blame.c67
-rw-r--r--builtin/branch.c56
-rw-r--r--builtin/cat-file.c24
-rw-r--r--builtin/check-attr.c12
-rw-r--r--builtin/checkout-index.c24
-rw-r--r--builtin/checkout.c46
-rw-r--r--builtin/clean.c18
-rw-r--r--builtin/clone.c64
-rw-r--r--builtin/column.c16
-rw-r--r--builtin/commit-tree.c4
-rw-r--r--builtin/commit.c100
-rw-r--r--builtin/config.c99
-rw-r--r--builtin/count-objects.c4
-rw-r--r--builtin/credential.c31
-rw-r--r--builtin/describe.c28
-rw-r--r--builtin/diff.c11
-rw-r--r--builtin/fast-export.c28
-rw-r--r--builtin/fetch-pack.c20
-rw-r--r--builtin/fetch.c48
-rw-r--r--builtin/fmt-merge-msg.c16
-rw-r--r--builtin/for-each-ref.c22
-rw-r--r--builtin/fsck.c24
-rw-r--r--builtin/gc.c12
-rw-r--r--builtin/grep.c202
-rw-r--r--builtin/hash-object.c16
-rw-r--r--builtin/help.c35
-rw-r--r--builtin/index-pack.c199
-rw-r--r--builtin/init-db.c19
-rw-r--r--builtin/log.c106
-rw-r--r--builtin/ls-files.c54
-rw-r--r--builtin/ls-tree.c22
-rw-r--r--builtin/mailinfo.c28
-rw-r--r--builtin/merge-base.c12
-rw-r--r--builtin/merge-file.c20
-rw-r--r--builtin/merge.c51
-rw-r--r--builtin/mktree.c8
-rw-r--r--builtin/mv.c10
-rw-r--r--builtin/name-rev.c22
-rw-r--r--builtin/notes.c120
-rw-r--r--builtin/pack-objects.c139
-rw-r--r--builtin/pack-refs.c6
-rw-r--r--builtin/prune-packed.c6
-rw-r--r--builtin/prune.c13
-rw-r--r--builtin/push.c63
-rw-r--r--builtin/read-tree.c38
-rw-r--r--builtin/receive-pack.c9
-rw-r--r--builtin/reflog.c6
-rw-r--r--builtin/remote.c84
-rw-r--r--builtin/replace.c12
-rw-r--r--builtin/rerere.c4
-rw-r--r--builtin/reset.c30
-rw-r--r--builtin/rev-parse.c48
-rw-r--r--builtin/revert.c38
-rw-r--r--builtin/rm.c14
-rw-r--r--builtin/send-pack.c15
-rw-r--r--builtin/shortlog.c14
-rw-r--r--builtin/show-branch.c42
-rw-r--r--builtin/show-ref.c28
-rw-r--r--builtin/symbolic-ref.c8
-rw-r--r--builtin/tag.c56
-rw-r--r--builtin/update-index.c65
-rw-r--r--builtin/update-ref.c10
-rw-r--r--builtin/update-server-info.c4
-rw-r--r--builtin/verify-pack.c6
-rw-r--r--builtin/verify-tag.c4
-rw-r--r--builtin/write-tree.c10
-rw-r--r--cache.h56
-rw-r--r--combine-diff.c4
-rw-r--r--command-list.txt4
-rw-r--r--commit.c90
-rw-r--r--compat/mkdir.c24
-rw-r--r--compat/precompose_utf8.c184
-rw-r--r--compat/precompose_utf8.h45
-rw-r--r--config.c34
-rw-r--r--config.mak.in1
-rw-r--r--configure.ac63
-rw-r--r--connect.c63
-rw-r--r--[-rwxr-xr-x]contrib/completion/git-completion.bash264
-rw-r--r--contrib/completion/git-prompt.sh289
-rw-r--r--contrib/credential/wincred/Makefile14
-rw-r--r--contrib/credential/wincred/git-credential-wincred.c357
-rw-r--r--contrib/mw-to-git/Makefile47
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki777
-rw-r--r--contrib/mw-to-git/t/.gitignore4
-rw-r--r--contrib/mw-to-git/t/Makefile31
-rw-r--r--contrib/mw-to-git/t/README124
-rwxr-xr-xcontrib/mw-to-git/t/install-wiki.sh45
-rw-r--r--contrib/mw-to-git/t/install-wiki/.gitignore1
-rw-r--r--contrib/mw-to-git/t/install-wiki/LocalSettings.php129
-rw-r--r--contrib/mw-to-git/t/install-wiki/db_install.php120
-rw-r--r--