summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Documentation/Makefile44
-rw-r--r--Documentation/RelNotes/1.8.3.1.txt14
-rw-r--r--Documentation/RelNotes/1.8.4.txt286
-rw-r--r--Documentation/blame-options.txt21
-rw-r--r--Documentation/config.txt22
-rw-r--r--Documentation/diff-options.txt40
-rw-r--r--Documentation/fetch-options.txt2
-rw-r--r--Documentation/git-blame.txt6
-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-config.txt9
-rw-r--r--Documentation/git-describe.txt9
-rw-r--r--Documentation/git-diff-index.txt12
-rw-r--r--Documentation/git-diff.txt14
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-log.txt22
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-push.txt16
-rw-r--r--Documentation/git-rebase.txt10
-rw-r--r--Documentation/git-stash.txt13
-rw-r--r--Documentation/git-web--browse.txt1
-rw-r--r--Documentation/git.txt34
-rw-r--r--Documentation/gitdiffcore.txt45
-rw-r--r--Documentation/gitrepository-layout.txt3
-rw-r--r--Documentation/line-range-format.txt25
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/pull-fetch-param.txt11
-rw-r--r--Documentation/rev-list-options.txt42
-rw-r--r--Documentation/revisions.txt3
-rw-r--r--Documentation/technical/api-builtin.txt2
-rw-r--r--Documentation/technical/api-parse-options.txt12
-rw-r--r--Documentation/urls.txt8
-rw-r--r--Documentation/user-manual.txt19
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile128
l---------RelNotes2
-rw-r--r--abspath.c2
-rw-r--r--advice.c4
-rw-r--r--advice.h2
-rw-r--r--archive-zip.c1
-rw-r--r--bisect.c5
-rw-r--r--builtin.h19
-rw-r--r--builtin/apply.c4
-rw-r--r--builtin/blame.c99
-rw-r--r--builtin/check-ignore.c92
-rw-r--r--builtin/clone.c18
-rw-r--r--builtin/commit.c13
-rw-r--r--builtin/config.c9
-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.c31
-rw-r--r--builtin/ls-files.c8
-rw-r--r--builtin/merge-base.c2
-rw-r--r--builtin/merge.c3
-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.c2
-rw-r--r--builtin/push.c21
-rw-r--r--builtin/read-tree.c5
-rw-r--r--builtin/replace.c2
-rw-r--r--builtin/rm.c101
-rw-r--r--builtin/show-ref.c2
-rw-r--r--bundle.c2
-rw-r--r--cache.h27
-rw-r--r--color.c2
-rw-r--r--combine-diff.c10
-rw-r--r--commit.h2
-rw-r--r--compat/clipped-write.c13
-rw-r--r--compat/cygwin.c5
-rw-r--r--compat/fnmatch/fnmatch.c3
-rw-r--r--compat/mingw.c10
-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.c28
-rw-r--r--config.mak.uname8
-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.bash183
-rw-r--r--contrib/completion/git-completion.zsh27
-rw-r--r--contrib/completion/git-prompt.sh143
-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/Makefile2
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki.perl630
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw-lib.sh19
-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
-rwxr-xr-xcontrib/remote-helpers/test-bzr.sh492
-rwxr-xr-xcontrib/remote-helpers/test-hg-bidi.sh35
-rwxr-xr-xcontrib/remote-helpers/test-hg-hg-git.sh55
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh725
-rwxr-xr-xcontrib/subtree/git-subtree.sh5
-rw-r--r--credential-store.c4
-rw-r--r--decorate.c2
-rw-r--r--diff-lib.c26
-rw-r--r--diff-no-index.c2
-rw-r--r--diffcore-pickaxe.c4
-rw-r--r--dir.c7
-rw-r--r--environment.c1
-rw-r--r--fast-import.c6
-rw-r--r--fetch-pack.c84
-rw-r--r--fetch-pack.h4
-rwxr-xr-xgit-am.sh30
-rwxr-xr-xgit-bisect.sh4
-rw-r--r--git-compat-util.h17
-rwxr-xr-xgit-difftool.perl9
-rwxr-xr-xgit-gui/GIT-VERSION-GEN2
-rw-r--r--git-gui/Makefile6
-rwxr-xr-x