summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore6
-rw-r--r--Documentation/RelNotes/1.8.1.2.txt12
-rw-r--r--Documentation/RelNotes/1.8.2.txt308
-rw-r--r--Documentation/config.txt55
-rw-r--r--Documentation/fetch-options.txt6
-rw-r--r--Documentation/git-check-ignore.txt89
-rw-r--r--Documentation/git-commit-tree.txt4
-rw-r--r--Documentation/git-commit.txt4
-rw-r--r--Documentation/git-cvsimport.txt6
-rw-r--r--Documentation/git-cvsserver.txt37
-rw-r--r--Documentation/git-fetch-pack.txt2
-rw-r--r--Documentation/git-format-patch.txt11
-rw-r--r--Documentation/git-log.txt7
-rw-r--r--Documentation/git-p4.txt22
-rw-r--r--Documentation/git-push.txt9
-rw-r--r--Documentation/git-remote-testgit.txt2
-rw-r--r--Documentation/git-reset.txt18
-rw-r--r--Documentation/git-submodule.txt25
-rw-r--r--Documentation/git-svn.txt10
-rw-r--r--Documentation/git.txt15
-rw-r--r--Documentation/githooks.txt29
-rw-r--r--Documentation/gitignore.txt25
-rw-r--r--Documentation/gitmodules.txt5
-rw-r--r--Documentation/howto/maintain-git.txt347
-rw-r--r--Documentation/mailmap.txt3
-rw-r--r--Documentation/pretty-formats.txt6
-rw-r--r--Documentation/technical/api-directory-listing.txt35
-rw-r--r--Documentation/technical/api-string-list.txt8
-rw-r--r--Documentation/technical/shallow.txt3
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile594
-rw-r--r--README15
l---------RelNotes2
-rw-r--r--abspath.c105
-rw-r--r--advice.c9
-rw-r--r--advice.h3
-rw-r--r--attr.c42
-rw-r--r--builtin.h1
-rw-r--r--builtin/add.c80
-rw-r--r--builtin/blame.c189
-rw-r--r--builtin/branch.c2
-rw-r--r--builtin/check-ignore.c173
-rw-r--r--builtin/clean.c159
-rw-r--r--builtin/clone.c11
-rw-r--r--builtin/commit.c10
-rw-r--r--builtin/fast-export.c27
-rw-r--r--builtin/fetch.c17
-rw-r--r--builtin/grep.c2
-rw-r--r--builtin/help.c18
-rw-r--r--builtin/log.c85
-rw-r--r--builtin/ls-files.c19
-rw-r--r--builtin/ls-tree.c2
-rw-r--r--builtin/merge-index.c4
-rw-r--r--builtin/merge-tree.c92
-rw-r--r--builtin/push.c33
-rw-r--r--builtin/receive-pack.c25
-rw-r--r--builtin/reset.c287
-rw-r--r--builtin/send-pack.c9
-rw-r--r--builtin/shortlog.c54
-rw-r--r--cache.h22
-rw-r--r--command-list.txt1
-rw-r--r--commit.h5
-rw-r--r--compat/fnmatch/fnmatch.c3
-rw-r--r--config.c9
-rw-r--r--config.mak.uname539
-rw-r--r--configure.ac14
-rwxr-xr-xcontrib/ciabot/ciabot.py8
-rw-r--r--contrib/completion/git-completion.bash16
-rw-r--r--contrib/completion/git-completion.tcsh33
-rwxr-xr-xcontrib/fast-import/import-zips.py7
-rwxr-xr-xcontrib/hg-to-git/hg-to-git.py5
-rwxr-xr-xcontrib/hooks/post-receive-email1
-rw-r--r--contrib/p4import/git-p4import.py5
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr725
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg13
-rwxr-xr-xcontrib/remote-helpers/test-bzr.sh143
-rwxr-xr-xcontrib/remote-helpers/test-hg-hg-git.sh68
-rwxr-xr-xcontrib/svn-fe/svnrdump_sim.py4
-rw-r--r--contrib/vim/README16
-rw-r--r--ctype.c15
-rw-r--r--diff.c2
-rw-r--r--dir.c449
-rw-r--r--dir.h102
-rw-r--r--environment.c1
-rw-r--r--fetch-pack.c3
-rw-r--r--fsck.c15
-rwxr-xr-xgit-am.sh2
-rw-r--r--git-compat-util.h46
-rwxr-xr-xgit-cvsserver.perl1927
-rwxr-xr-xgit-p4.py160
-rw-r--r--git-rebase--am.sh49
-rw-r--r--git-rebase--interactive.sh7
-rwxr-xr-xgit-remote-testgit90
-rw-r--r--git-remote-testpy.py (renamed from git-remote-testgit.py)15
-rwxr-xr-xgit-submodule.sh51
-rwxr-xr-xgit-svn.perl49
-rw-r--r--git.c9
-rw-r--r--git_remote_helpers/git/__init__.py5
-rw-r--r--git_remote_helpers/git/importer.py2
-rw-r--r--gitk-git/.gitignore2
-rw-r--r--gitk-git/Makefile16
-rwxr-xr-xgitk-git/gitk196
-rw-r--r--gitk-git/po/sv.po673
-rw-r--r--help.c17
-rw-r--r--http-push.c23
-rw-r--r--imap-send.c429
-rw-r--r--log-tree.c54
-rw-r--r--log-tree.h4
-rw-r--r--mailmap.c246
-rw-r--r--mailmap.h4
-rw-r--r--merge-blobs.c (renamed from merge-file.c)4
-rw-r--r--merge-blobs.h8
-rw-r--r--merge-file.h7
-rw-r--r--merge-recursive.c6
-rw-r--r--mergetools/p4merge27
-rw-r--r--parse-options.c18
-rw-r--r--parse-options.h4
-rw-r--r--path.c46
-rw-r--r--pathspec.c101
-rw-r--r--pathspec.h9
-rw-r--r--perl/Git/SVN.pm4
-rw-r--r--perl/Git/SVN/Editor.pm7
-rw-r--r--perl/Git/SVN/Utils.pm2
-rw-r--r--po/de.po484
-rw-r--r--pretty.c133
-rw-r--r--read-cache.c24
-rw-r--r--refs.c10
-rw-r--r--remote.c56
-rw-r--r--revision.c54
-rw-r--r--revision.h2
-rw-r--r--run-command.c15
-rw-r--r--run-command.h1
-rw-r--r--send-pack.c1