summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/CodingGuidelines3
-rw-r--r--Documentation/RelNotes/1.8.2.1.txt71
-rw-r--r--Documentation/RelNotes/1.8.3.txt207
-rw-r--r--Documentation/config.txt16
-rw-r--r--Documentation/diff-options.txt4
-rw-r--r--Documentation/git-commit.txt31
-rw-r--r--Documentation/git-count-objects.txt22
-rw-r--r--Documentation/git-describe.txt5
-rw-r--r--Documentation/git-difftool.txt8
-rw-r--r--Documentation/git-filter-branch.txt27
-rw-r--r--Documentation/git-merge.txt24
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt31
-rw-r--r--Documentation/git-rm.txt4
-rw-r--r--Documentation/git-send-email.txt4
-rw-r--r--Documentation/git-sh-setup.txt6
-rw-r--r--Documentation/git-shell.txt82
-rw-r--r--Documentation/git-status.txt14
-rw-r--r--Documentation/git-submodule.txt18
-rw-r--r--Documentation/git-update-index.txt10
-rw-r--r--Documentation/git.txt9
-rw-r--r--Documentation/gitcli.txt9
-rw-r--r--Documentation/githooks.txt8
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/pretty-formats.txt1
-rw-r--r--Documentation/technical/index-format.txt6
-rw-r--r--Documentation/user-manual.txt290
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--archive-zip.c38
-rw-r--r--archive.c2
-rw-r--r--builtin/branch.c27
-rw-r--r--builtin/commit.c4
-rw-r--r--builtin/count-objects.c30
-rw-r--r--builtin/describe.c45
-rw-r--r--builtin/fast-export.c22
-rw-r--r--builtin/fetch-pack.c40
-rw-r--r--builtin/fmt-merge-msg.c2
-rw-r--r--builtin/grep.c4
-rw-r--r--builtin/index-pack.c9
-rw-r--r--builtin/mailsplit.c23
-rw-r--r--builtin/merge-tree.c2
-rw-r--r--builtin/prune.c4
-rw-r--r--builtin/push.c2
-rw-r--r--builtin/reflog.c2
-rw-r--r--builtin/tag.c2
-rw-r--r--builtin/update-index.c2
-rw-r--r--builtin/verify-tag.c2
-rw-r--r--bundle.c16
-rw-r--r--cache.h32
-rw-r--r--combine-diff.c57
-rw-r--r--commit.c42
-rw-r--r--commit.h2
-rw-r--r--compat/msvc.h2
-rw-r--r--compat/vcbuild/include/sys/poll.h1
-rw-r--r--compat/vcbuild/include/unistd.h3
-rw-r--r--config.mak.uname4
-rw-r--r--contrib/completion/git-completion.bash2
-rw-r--r--contrib/credential/gnome-keyring/git-credential-gnome-keyring.c2
-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/credential/osxkeychain/git-credential-osxkeychain.c2
-rw-r--r--contrib/credential/wincred/git-credential-wincred.c2
-rwxr-xr-xcontrib/examples/git-remote.perl10
-rwxr-xr-xcontrib/examples/git-svnimport.perl2
-rwxr-xr-xcontrib/fast-import/git-import.perl2
-rwxr-xr-xcontrib/fast-import/git-import.sh2
-rwxr-xr-xcontrib/fast-import/import-zips.py98
-rw-r--r--contrib/hooks/setgitperms.perl2
-rwxr-xr-xcontrib/mw-to-git/t/install-wiki.sh2
-rw-r--r--daemon.c4
-rw-r--r--date.c12
-rw-r--r--diff.c14
-rw-r--r--diffcore-rename.c1
-rw-r--r--entry.c2
-rw-r--r--environment.c8
-rw-r--r--fetch-pack.c101
-rw-r--r--fetch-pack.h11
-rwxr-xr-xgit-archimport.perl2
-rw-r--r--git-compat-util.h14
-rwxr-xr-xgit-cvsexportcommit.perl2
-rwxr-xr-xgit-cvsimport.perl2
-rwxr-xr-xgit-cvsserver.perl2
-rwxr-xr-xgit-difftool.perl27
-rwxr-xr-xgit-merge-one-file.sh63
-rwxr-xr-xgit-p4.py29
-rwxr-xr-xgit-pull.sh2
-rwxr-xr-xgit-relink.perl2
-rwxr-xr-xgit-send-email.perl71
-rw-r--r--git-sh-setup.sh18
-rwxr-xr-xgit-submodule.sh108
-rwxr-xr-xgit-svn.perl6
-rw-r--r--git.c1
-rw-r--r--gpg-interface.c18
-rw-r--r--gpg-interface.h2
-rw-r--r--graph.c32
-rw-r--r--graph.h33
-rw-r--r--grep.c3
-rw-r--r--grep.h3
-rw-r--r--hash.h7
-rw-r--r--imap-send.c11
-rw-r--r--log-tree.c27
-rw-r--r--mergetools/p4merge8
-rw-r--r--name-hash.c2
-rw-r--r--object.c10
-rw-r--r--object.h13
-rw-r--r--pack-refs.c18
-rw-r--r--perl/Git.pm215
-rw-r--r--perl/Git/SVN/Ra.pm2
-rw-r--r--pretty.c53
-rw-r--r--reachable.c4
-rw-r--r--read-cache.c2
-rw-r--r--refs.c210
-rw-r--r--refs.h2
-rw-r--r--remote.c140
-rw-r--r--remote.h4
-rw-r--r--revision.c32
-rw-r--r--setup.c24
-rw-r--r--sha1_file.c107
-rw-r--r--sha1_name.c48
-rw-r--r--shell.c13
-rw-r--r--t/lib-git-svn.sh2
-rwxr-xr-xt/t0024-crlf-archive.sh6
-rwxr-xr-xt/t1509/prepare-chroot.sh2
-rwxr-xr-xt/t1510-repo-setup.sh19
-rwxr-xr-xt/t2003-checkout-cache-mkdir.sh169
-rwxr-xr-xt/t2200-add-update.sh16
-rwxr-xr-xt/t3200-branch.sh21
-rwxr-xr-x