summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--.gitignore3
-rw-r--r--.mailmap1
-rw-r--r--Documentation/.gitattributes1
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/RelNotes-1.5.5.txt207
-rw-r--r--Documentation/SubmittingPatches65
-rw-r--r--Documentation/config.txt143
-rw-r--r--Documentation/diff-options.txt8
-rw-r--r--Documentation/git-add.txt6
-rw-r--r--Documentation/git-am.txt6
-rw-r--r--Documentation/git-branch.txt32
-rw-r--r--Documentation/git-bundle.txt44
-rw-r--r--Documentation/git-checkout.txt26
-rw-r--r--Documentation/git-commit.txt4
-rw-r--r--Documentation/git-cvsimport.txt6
-rw-r--r--Documentation/git-cvsserver.txt5
-rw-r--r--Documentation/git-describe.txt18
-rw-r--r--Documentation/git-fast-import.txt98
-rw-r--r--Documentation/git-fetch-pack.txt8
-rw-r--r--Documentation/git-filter-branch.txt23
-rw-r--r--Documentation/git-format-patch.txt25
-rw-r--r--Documentation/git-gc.txt31
-rw-r--r--Documentation/git-grep.txt4
-rw-r--r--Documentation/git-help.txt85
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-instaweb.txt12
-rw-r--r--Documentation/git-merge-index.txt2
-rw-r--r--Documentation/git-mergetool.txt38
-rw-r--r--Documentation/git-pack-objects.txt15
-rw-r--r--Documentation/git-pull.txt20
-rw-r--r--Documentation/git-rebase.txt4
-rw-r--r--Documentation/git-reflog.txt14
-rw-r--r--Documentation/git-rev-list.txt4
-rw-r--r--Documentation/git-rev-parse.txt17
-rw-r--r--Documentation/git-send-email.txt53
-rw-r--r--Documentation/git-stash.txt13
-rw-r--r--Documentation/git-submodule.txt24
-rw-r--r--Documentation/git-svn.txt7
-rw-r--r--Documentation/git-tag.txt7
-rw-r--r--Documentation/git-verify-pack.txt4
-rw-r--r--Documentation/git-web--browse.txt99
-rw-r--r--Documentation/git-whatchanged.txt9
-rw-r--r--Documentation/git.txt12
-rw-r--r--Documentation/gitattributes.txt20
-rw-r--r--Documentation/gitignore.txt7
-rw-r--r--Documentation/glossary.txt9
-rw-r--r--Documentation/hooks.txt29
-rw-r--r--Documentation/merge-strategies.txt7
-rw-r--r--Documentation/pretty-options.txt3
-rw-r--r--Documentation/rev-list-options.txt7
-rw-r--r--Documentation/technical/api-remote.txt123
-rw-r--r--Documentation/technical/api-run-command.txt172
-rw-r--r--Documentation/technical/pack-format.txt16
-rw-r--r--Documentation/urls.txt23
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile473
l---------RelNotes2
-rw-r--r--alias.c22
-rw-r--r--branch.c152
-rw-r--r--branch.h24
-rw-r--r--builtin-apply.c733
-rw-r--r--builtin-blame.c14
-rw-r--r--builtin-branch.c168
-rw-r--r--builtin-bundle.c2
-rw-r--r--builtin-checkout.c577
-rw-r--r--builtin-clean.c44
-rw-r--r--builtin-commit.c264
-rw-r--r--builtin-config.c7
-rw-r--r--builtin-describe.c124
-rw-r--r--builtin-diff-files.c2
-rw-r--r--builtin-diff.c18
-rwxr-xr-xbuiltin-fast-export.c6
-rw-r--r--builtin-fetch-pack.c122
-rw-r--r--builtin-fetch.c54
-rw-r--r--builtin-fmt-merge-msg.c3
-rw-r--r--builtin-for-each-ref.c2
-rw-r--r--builtin-fsck.c343
-rw-r--r--builtin-gc.c29
-rw-r--r--builtin-grep.c17
-rw-r--r--builtin-http-fetch.c3
-rw-r--r--builtin-init-db.c11
-rw-r--r--builtin-log.c378
-rw-r--r--builtin-ls-files.c16
-rw-r--r--builtin-ls-remote.c4
-rw-r--r--builtin-merge-file.c2
-rw-r--r--builtin-merge-recursive.c (renamed from merge-recursive.c)442
-rw-r--r--builtin-mv.c4
-rw-r--r--builtin-name-rev.c57
-rw-r--r--builtin-pack-objects.c241
-rw-r--r--builtin-prune.c49
-rw-r--r--builtin-push.c9
-rw-r--r--builtin-read-tree.c39
-rw-r--r--builtin-reflog.c102
-rw-r--r--builtin-remote.c609
-rw-r--r--builtin-rerere.c4
-rw-r--r--builtin-reset.c75
-rw-r--r--builtin-rev-list.c12
-rw-r--r--builtin-rev-parse.c28
-rw-r--r--builtin-revert.c8
-rw-r--r--builtin-send-pack.c19
-rw-r--r--builtin-shortlog.c152
-rw-r--r--builtin-show-ref.c3
-rw-r--r--builtin-tag.c6
-rw-r--r--builtin-unpack-objects.c23
-rw-r--r--builtin-update-index.c18
-rw-r--r--builtin-verify-pack.c2
-rw-r--r--builtin-verify-tag.c6
-rw-r--r--builtin-write-tree.c71
-rw-r--r--builtin.h4
-rw-r--r--bundle.c9
-rw-r--r--cache-tree.c59
-rw-r--r--cache-tree.h5
-rw-r--r--cache.h155
-rw-r--r--color.c12
-rw-r--r--color.h11
-rw-r--r--commit.c27
-rw-r--r--commit.h16
-rw-r--r--compat/fopen.c26
-rw-r--r--compat/qsort.c62
-rw-r--r--compat/snprintf.c40
-rw-r--r--config.c54
-rw-r--r--config.mak.in2
-rw-r--r--configure.ac54
-rw-r--r--connect.c23
-rwxr-xr-xcontrib/completion/git-completion.bash271
-rw-r--r--contrib/emacs/git-blame.el10
-rw-r--r--contrib/emacs/git.el195
-rwxr-xr-xcontrib/examples/git-checkout.sh (renamed from git-checkout.sh)11
-rwxr-xr-xcontrib/examples/git-remote.perl (renamed from git-remote.perl)16
-rwxr-xr-xcontrib/examples/git-rerere.perl284
-rwxr-xr-x