summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/CodingGuidelines6
-rw-r--r--Documentation/RelNotes/1.8.3.1.txt14
-rw-r--r--Documentation/RelNotes/1.8.3.txt436
-rw-r--r--Documentation/config.txt49
-rw-r--r--Documentation/diff-options.txt2
-rw-r--r--Documentation/git-add.txt20
-rw-r--r--Documentation/git-am.txt7
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-check-ref-format.txt3
-rw-r--r--Documentation/git-checkout.txt12
-rw-r--r--Documentation/git-clone.txt4
-rw-r--r--Documentation/git-commit-tree.txt7
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt3
-rw-r--r--Documentation/git-count-objects.txt30
-rw-r--r--Documentation/git-daemon.txt9
-rw-r--r--Documentation/git-difftool.txt11
-rw-r--r--Documentation/git-fast-export.txt22
-rw-r--r--Documentation/git-fetch-pack.txt6
-rw-r--r--Documentation/git-fmt-merge-msg.txt3
-rw-r--r--Documentation/git-format-patch.txt5
-rw-r--r--Documentation/git-fsck.txt6
-rw-r--r--Documentation/git-grep.txt2
-rw-r--r--Documentation/git-help.txt28
-rw-r--r--Documentation/git-log.txt22
-rw-r--r--Documentation/git-mailinfo.txt2
-rw-r--r--Documentation/git-merge.txt3
-rw-r--r--Documentation/git-mergetool.txt2
-rw-r--r--Documentation/git-push.txt18
-rw-r--r--Documentation/git-remote.txt2
-rw-r--r--Documentation/git-rev-parse.txt19
-rw-r--r--Documentation/git-revert.txt2
-rw-r--r--Documentation/git-rm.txt4
-rw-r--r--Documentation/git-send-email.txt9
-rw-r--r--Documentation/git-sh-setup.txt6
-rw-r--r--Documentation/git-shell.txt82
-rw-r--r--Documentation/git-shortlog.txt23
-rw-r--r--Documentation/git-submodule.txt26
-rw-r--r--Documentation/git-svn.txt48
-rw-r--r--Documentation/git-update-index.txt10
-rw-r--r--Documentation/git.txt6
-rw-r--r--Documentation/gitremote-helpers.txt8
-rw-r--r--Documentation/gitrepository-layout.txt7
-rw-r--r--Documentation/glossary-content.txt13
-rw-r--r--Documentation/merge-options.txt5
-rw-r--r--Documentation/pretty-formats.txt38
-rw-r--r--Documentation/revisions.txt11
-rw-r--r--Documentation/technical/api-directory-listing.txt25
-rw-r--r--Documentation/technical/api-strbuf.txt5
-rw-r--r--Documentation/technical/pack-protocol.txt3
-rw-r--r--Documentation/urls.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile36
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--archive-zip.c36
-rw-r--r--attr.c35
-rw-r--r--branch.c100
-rw-r--r--builtin/add.c241
-rw-r--r--builtin/archive.c17
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/branch.c66
-rw-r--r--builtin/check-ignore.c7
-rw-r--r--builtin/checkout.c92
-rw-r--r--builtin/clone.c70
-rw-r--r--builtin/commit-tree.c2
-rw-r--r--builtin/commit.c14
-rw-r--r--builtin/config.c4
-rw-r--r--builtin/count-objects.c72
-rw-r--r--builtin/fast-export.c41
-rw-r--r--builtin/fetch-pack.c49
-rw-r--r--builtin/help.c46
-rw-r--r--builtin/log.c184
-rw-r--r--builtin/ls-files.c15
-rw-r--r--builtin/merge-tree.c32
-rw-r--r--builtin/merge.c37
-rw-r--r--builtin/push.c4
-rw-r--r--builtin/receive-pack.c10
-rw-r--r--builtin/rm.c2
-rw-r--r--builtin/send-pack.c4
-rw-r--r--builtin/shortlog.c4
-rw-r--r--builtin/upload-archive.c45
-rw-r--r--cache.h20
-rw-r--r--combine-diff.c262
-rw-r--r--commit.c112
-rw-r--r--commit.h13
-rw-r--r--compat/cygwin.c13
-rw-r--r--compat/cygwin.h5
-rw-r--r--compat/mingw.c4
-rw-r--r--compat/msvc.h2
-rw-r--r--compat/precompose_utf8.c2
-rw-r--r--compat/vcbuild/include/sys/poll.h1
-rw-r--r--compat/vcbuild/include/unistd.h3
-rw-r--r--config.c10
-rw-r--r--config.mak.in6
-rw-r--r--config.mak.uname5
-rw-r--r--connect.c13
-rw-r--r--contrib/completion/git-completion.bash96
-rw-r--r--contrib/completion/git-prompt.sh21
-rw-r--r--contrib/credential/netrc/Makefile5
-rwxr-xr-xcontrib/credential/netrc/git-credential-netrc421
-rw-r--r--contrib/credential/netrc/test.netrc13
-rwxr-xr-xcontrib/credential/netrc/test.pl106
-rw-r--r--contrib/remote-helpers/Makefile1
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr450
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg304
-rwxr-xr-xcontrib/remote-helpers/test-bzr.sh228
-rwxr-xr-xcontrib/remote-helpers/test-hg-bidi.sh11
-rwxr-xr-xcontrib/remote-helpers/test-hg-hg-git.sh12
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh36
-rwxr-xr-xcontrib/subtree/git-subtree.sh3
-rw-r--r--convert.c27
-rw-r--r--daemon.c4
-rw-r--r--date.c12
-rw-r--r--diff.c1
-rw-r--r--diffcore-rename.c1
-rw-r--r--dir.c508
-rw-r--r--dir.h25
-rw-r--r--entry.c16
-rw-r--r--fetch-pack.c119
-rw-r--r--fetch-pack.h11
-rwxr-xr-xgit-am.sh14
-rwxr-xr-xgit-bisect.sh18
-rw-r--r--git-compat-util.h9
-rwxr-xr-xgit-difftool.perl106
-rwxr-xr-xgit-merge-one-file.sh61
-rwxr-xr-xgit-p4.py29
-rwxr-xr-xgit-pull.sh10
-rw-r--r--git-rebase--am.sh4
-rw-r--r--git-rebase--interactive.sh5