summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--.mailmap188
-rw-r--r--Documentation/Makefile44
-rw-r--r--Documentation/RelNotes/1.8.4.txt430
-rw-r--r--Documentation/blame-options.txt21
-rw-r--r--Documentation/config.txt110
-rw-r--r--Documentation/diff-options.txt3
-rw-r--r--Documentation/fetch-options.txt2
-rw-r--r--Documentation/git-am.txt4
-rw-r--r--Documentation/git-blame.txt6
-rw-r--r--Documentation/git-cat-file.txt79
-rw-r--r--Documentation/git-check-attr.txt5
-rw-r--r--Documentation/git-check-ignore.txt20
-rw-r--r--Documentation/git-check-ref-format.txt2
-rw-r--r--Documentation/git-clone.txt19
-rw-r--r--Documentation/git-config.txt29
-rw-r--r--Documentation/git-describe.txt9
-rw-r--r--Documentation/git-diff.txt14
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-format-patch.txt15
-rw-r--r--Documentation/git-gc.txt5
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-log.txt22
-rw-r--r--Documentation/git-ls-remote.txt11
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-name-rev.txt3
-rw-r--r--Documentation/git-p4.txt17
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-rebase.txt14
-rw-r--r--Documentation/git-reflog.txt9
-rw-r--r--Documentation/git-remote.txt25
-rw-r--r--Documentation/git-rev-parse.txt16
-rw-r--r--Documentation/git-stash.txt25
-rw-r--r--Documentation/git-submodule.txt16
-rw-r--r--Documentation/git.txt24
-rw-r--r--Documentation/gitremote-helpers.txt12
-rw-r--r--Documentation/gitweb.conf.txt22
-rw-r--r--Documentation/glossary-content.txt4
-rw-r--r--Documentation/line-range-format.txt25
-rw-r--r--Documentation/pull-fetch-param.txt11
-rw-r--r--Documentation/rev-list-options.txt46
-rw-r--r--Documentation/revisions.txt3
-rw-r--r--Documentation/technical/api-builtin.txt2
-rw-r--r--Documentation/technical/api-parse-options.txt18
-rw-r--r--Documentation/technical/racy-git.txt6
-rw-r--r--Documentation/urls.txt9
-rw-r--r--Documentation/user-manual.txt49
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile87
l---------RelNotes2
-rw-r--r--abspath.c2
-rw-r--r--advice.c4
-rw-r--r--advice.h2
-rw-r--r--bisect.c5
-rw-r--r--builtin.h19
-rw-r--r--builtin/blame.c99
-rw-r--r--builtin/cat-file.c210
-rw-r--r--builtin/check-ignore.c92
-rw-r--r--builtin/checkout.c18
-rw-r--r--builtin/clone.c34
-rw-r--r--builtin/commit.c86
-rw-r--r--builtin/config.c5
-rw-r--r--builtin/describe.c11
-rw-r--r--builtin/diff.c69
-rw-r--r--builtin/fast-export.c22
-rw-r--r--builtin/fetch.c102
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/help.c2
-rw-r--r--builtin/index-pack.c38
-rw-r--r--builtin/log.c57
-rw-r--r--builtin/ls-files.c12
-rw-r--r--builtin/merge.c59
-rw-r--r--builtin/name-rev.c36
-rw-r--r--builtin/notes.c138
-rw-r--r--builtin/pack-refs.c2
-rw-r--r--builtin/prune-packed.c15
-rw-r--r--builtin/prune.c6
-rw-r--r--builtin/push.c55
-rw-r--r--builtin/read-tree.c5
-rw-r--r--builtin/reflog.c14
-rw-r--r--builtin/replace.c2
-rw-r--r--builtin/reset.c5
-rw-r--r--builtin/rev-list.c1
-rw-r--r--builtin/rev-parse.c24
-rw-r--r--builtin/rm.c101
-rw-r--r--builtin/shortlog.c1
-rw-r--r--builtin/show-branch.c14
-rw-r--r--builtin/show-ref.c2
-rw-r--r--bundle.c2
-rw-r--r--cache.h89
-rw-r--r--color.c2
-rw-r--r--commit-slab.h98
-rw-r--r--commit.c218
-rw-r--r--commit.h40
-rw-r--r--compat/cygwin.c5
-rw-r--r--compat/fnmatch/fnmatch.c3
-rw-r--r--compat/mingw.c6
-rw-r--r--compat/mingw.h11
-rw-r--r--compat/nedmalloc/malloc.c.h6
-rw-r--r--compat/nedmalloc/nedmalloc.c4
-rw-r--r--compat/poll/poll.c2
-rw-r--r--compat/regex/regexec.c6
-rw-r--r--compat/terminal.c4
-rw-r--r--compat/unsetenv.c1
-rw-r--r--compat/win32.h2
-rw-r--r--compat/win32/pthread.c2
-rw-r--r--compat/win32mmap.c4
-rw-r--r--config.c3
-rw-r--r--config.mak.uname7
-rw-r--r--connect.c7
-rw-r--r--connected.c34
-rw-r--r--connected.h5
-rw-r--r--contrib/blameview/README9
-rwxr-xr-xcontrib/blameview/blameview.perl155
-rw-r--r--contrib/completion/git-completion.bash187
-rw-r--r--contrib/completion/git-completion.zsh27
-rw-r--r--contrib/completion/git-prompt.sh340
-rw-r--r--contrib/continuous/cidaemon503
-rw-r--r--contrib/continuous/post-receive-cinotify104
-rw-r--r--contrib/credential/osxkeychain/git-credential-osxkeychain.c12
-rw-r--r--contrib/mw-to-git/.perlcriticrc28
-rw-r--r--contrib/mw-to-git/Git/Mediawiki.pm100
-rw-r--r--contrib/mw-to-git/Makefile35
-rwxr-xr-xcontrib/mw-to-git/bin-wrapper/git14
-rwxr-xr-xcontrib/mw-to-git/git-mw.perl368
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki.perl667
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw-lib.sh27
-rw-r--r--contrib/mw-to-git/t/test.config4
-rw-r--r--contrib/patches/docbook-xsl-manpages-charmap.patch21
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr117
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg510