summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--.mailmap19
-rw-r--r--Documentation/CodingGuidelines8
-rw-r--r--Documentation/Makefile28
-rw-r--r--Documentation/RelNotes/1.5.2.1.txt6
-rw-r--r--Documentation/RelNotes/1.6.0.2.txt6
-rw-r--r--Documentation/RelNotes/1.6.1.3.txt4
-rw-r--r--Documentation/RelNotes/1.6.1.4.txt3
-rw-r--r--Documentation/RelNotes/1.6.1.txt6
-rw-r--r--Documentation/RelNotes/1.7.12.4.txt23
-rw-r--r--Documentation/RelNotes/1.8.0.1.txt64
-rw-r--r--Documentation/RelNotes/1.8.0.2.txt34
-rw-r--r--Documentation/RelNotes/1.8.0.3.txt14
-rw-r--r--Documentation/RelNotes/1.8.0.txt34
-rw-r--r--Documentation/RelNotes/1.8.1.txt241
-rw-r--r--Documentation/SubmittingPatches24
-rw-r--r--Documentation/config.txt19
-rw-r--r--Documentation/diff-config.txt17
-rw-r--r--Documentation/diff-options.txt9
-rw-r--r--Documentation/fetch-options.txt13
-rw-r--r--Documentation/git-bisect-lk2009.txt4
-rw-r--r--Documentation/git-checkout.txt51
-rw-r--r--Documentation/git-clone.txt4
-rw-r--r--Documentation/git-commit.txt22
-rw-r--r--Documentation/git-cvsimport.txt8
-rw-r--r--Documentation/git-diff.txt9
-rw-r--r--Documentation/git-fast-import.txt18
-rw-r--r--Documentation/git-fetch-pack.txt5
-rw-r--r--Documentation/git-format-patch.txt14
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-notes.txt4
-rw-r--r--Documentation/git-push.txt21
-rw-r--r--Documentation/git-remote-helpers.txt234
-rw-r--r--Documentation/git-reset.txt8
-rw-r--r--Documentation/git-rm.txt15
-rw-r--r--Documentation/git-send-email.txt4
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt3
-rw-r--r--Documentation/git-submodule.txt7
-rw-r--r--Documentation/git-svn.txt98
-rw-r--r--Documentation/git-symbolic-ref.txt10
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git.txt18
-rw-r--r--Documentation/gitattributes.txt6
-rw-r--r--Documentation/gitcli.txt12
-rw-r--r--Documentation/gitignore.txt6
-rw-r--r--Documentation/gitmodules.txt4
-rw-r--r--Documentation/gitrepository-layout.txt6
-rw-r--r--Documentation/howto/maintain-git.txt4
-rw-r--r--Documentation/howto/new-command.txt104
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt11
-rw-r--r--Documentation/howto/rebuild-from-update-hook.txt4
-rw-r--r--Documentation/howto/recover-corrupted-blob-object.txt10
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt4
-rw-r--r--Documentation/howto/revert-branch-rebase.txt4
-rw-r--r--Documentation/howto/separating-topic-branches.txt4
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt4
-rw-r--r--Documentation/howto/update-hook-example.txt50
-rw-r--r--Documentation/howto/use-git-daemon.txt3
-rw-r--r--Documentation/howto/using-signed-tag-in-pull-request.txt4
-rw-r--r--Documentation/mailmap.txt2
-rw-r--r--Documentation/merge-config.txt4
-rw-r--r--Documentation/rev-list-options.txt10
-rw-r--r--Documentation/technical/api-argv-array.txt8
-rw-r--r--Documentation/technical/api-index-skel.txt2
-rw-r--r--Documentation/technical/api-strbuf.txt16
-rw-r--r--Documentation/technical/api-string-list.txt9
-rw-r--r--Documentation/technical/index-format.txt7
-rw-r--r--Documentation/technical/pack-format.txt8
-rw-r--r--Documentation/technical/pack-protocol.txt7
-rw-r--r--Documentation/technical/send-pack-pipeline.txt4
-rw-r--r--Documentation/technical/shallow.txt8
-rw-r--r--Documentation/technical/trivial-merge.txt36
-rw-r--r--Documentation/urls.txt8
-rw-r--r--Documentation/user-manual.txt7
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile69
-rw-r--r--README7
l---------RelNotes2
-rw-r--r--argv-array.c20
-rw-r--r--argv-array.h2
-rw-r--r--attr.c71
-rw-r--r--bisect.c38
-rw-r--r--bisect.h4
-rw-r--r--builtin.h4
-rw-r--r--builtin/blame.c5
-rw-r--r--builtin/branch.c75
-rw-r--r--builtin/checkout.c3
-rw-r--r--builtin/commit.c33
-rw-r--r--builtin/config.c111
-rw-r--r--builtin/describe.c2
-rw-r--r--builtin/diff-index.c8
-rw-r--r--builtin/diff.c28
-rw-r--r--builtin/fetch-pack.c950
-rw-r--r--builtin/grep.c164
-rw-r--r--builtin/log.c8
-rw-r--r--builtin/mailinfo.c3
-rw-r--r--builtin/merge.c106
-rw-r--r--builtin/pack-objects.c1
-rw-r--r--builtin/pack-redundant.c6
-rw-r--r--builtin/remote.c2
-rw-r--r--builtin/replace.c15
-rw-r--r--builtin/rev-list.c49
-rw-r--r--builtin/rm.c140
-rw-r--r--builtin/send-pack.c333
-rw-r--r--builtin/show-ref.c23
-rw-r--r--builtin/symbolic-ref.c33
-rw-r--r--builtin/update-index.c1
-rw-r--r--cache.h19
-rw-r--r--commit.c10
-rw-r--r--commit.h8
-rw-r--r--compat/cygwin.c7
-rw-r--r--compat/fnmatch/fnmatch.c2
-rw-r--r--compat/mingw.c114
-rw-r--r--compat/mingw.h11
-rw-r--r--compat/terminal.c129
-rw-r--r--config.c60
-rw-r--r--config.mak.in2
-rw-r--r--configure.ac4
-rw-r--r--contrib/completion/git-completion.bash147
-rw-r--r--contrib/completion/git-completion.tcsh107
-rw-r--r--contrib/completion/git-completion.zsh78
-rw-r--r--contrib/completion/git-prompt.sh11
-rw-r--r--contrib/emacs/git.el2
-rwxr-xr-xcontrib/hooks/post-receive-email2
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki16
-rwxr-xr-xcontrib/mw-to-git/t/t9362-mw-to-git-utf8.sh26
-rw-r--r--contrib/remote-helpers/Makefile13
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg