summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Documentation/CodingGuidelines175
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/1.9.1.txt59
-rw-r--r--Documentation/RelNotes/1.9.2.txt67
-rw-r--r--Documentation/RelNotes/1.9.3.txt21
-rw-r--r--Documentation/RelNotes/1.9.4.txt16
-rw-r--r--Documentation/RelNotes/2.0.0.txt364
-rw-r--r--Documentation/RelNotes/2.1.0.txt200
-rw-r--r--Documentation/config.txt135
-rw-r--r--Documentation/diff-config.txt2
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt2
-rw-r--r--Documentation/everyday.txt2
-rw-r--r--Documentation/git-add.txt38
-rw-r--r--Documentation/git-am.txt17
-rw-r--r--Documentation/git-archive.txt5
-rw-r--r--Documentation/git-bisect.txt2
-rw-r--r--Documentation/git-blame.txt3
-rw-r--r--Documentation/git-cherry-pick.txt7
-rw-r--r--Documentation/git-clone.txt11
-rw-r--r--Documentation/git-commit-tree.txt5
-rw-r--r--Documentation/git-commit.txt14
-rw-r--r--Documentation/git-config.txt2
-rw-r--r--Documentation/git-count-objects.txt4
-rw-r--r--Documentation/git-cvsimport.txt4
-rw-r--r--Documentation/git-daemon.txt6
-rw-r--r--Documentation/git-diff.txt4
-rw-r--r--Documentation/git-fast-import.txt10
-rw-r--r--Documentation/git-filter-branch.txt4
-rw-r--r--Documentation/git-gc.txt3
-rw-r--r--Documentation/git-grep.txt3
-rw-r--r--Documentation/git-help.txt12
-rw-r--r--Documentation/git-http-backend.txt2
-rw-r--r--Documentation/git-ls-files.txt6
-rw-r--r--Documentation/git-merge.txt7
-rw-r--r--Documentation/git-mergetool.txt8
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-pack-objects.txt2
-rw-r--r--Documentation/git-prune.txt2
-rw-r--r--Documentation/git-push.txt12
-rw-r--r--Documentation/git-read-tree.txt4
-rw-r--r--Documentation/git-rebase.txt4
-rw-r--r--Documentation/git-remote.txt2
-rw-r--r--Documentation/git-repack.txt17
-rw-r--r--Documentation/git-request-pull.txt55
-rw-r--r--Documentation/git-reset.txt11
-rw-r--r--Documentation/git-rev-list.txt1
-rw-r--r--Documentation/git-rev-parse.txt38
-rw-r--r--Documentation/git-revert.txt6
-rw-r--r--Documentation/git-send-email.txt6
-rw-r--r--Documentation/git-shell.txt2
-rw-r--r--Documentation/git-show-branch.txt2
-rw-r--r--Documentation/git-show-ref.txt2
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt2
-rw-r--r--Documentation/git-submodule.txt25
-rw-r--r--Documentation/git-svn.txt27
-rw-r--r--Documentation/git-tag.txt6
-rw-r--r--Documentation/git-update-index.txt8
-rw-r--r--Documentation/git-update-ref.txt18
-rw-r--r--Documentation/git-upload-archive.txt32
-rw-r--r--Documentation/git-web--browse.txt4
-rw-r--r--Documentation/git.txt24
-rw-r--r--Documentation/gitcli.txt8
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcvs-migration.txt2
-rw-r--r--Documentation/gitignore.txt3
-rw-r--r--Documentation/gitk.txt12
-rw-r--r--Documentation/gitremote-helpers.txt4
-rw-r--r--Documentation/gitrepository-layout.txt4
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/glossary-content.txt4
-rwxr-xr-xDocumentation/howto-index.sh12
-rw-r--r--Documentation/howto/keep-canonical-history-correct.txt216
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt2
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt4
-rw-r--r--Documentation/howto/revert-branch-rebase.txt2
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt2
-rwxr-xr-xDocumentation/install-webdoc.sh6
-rw-r--r--Documentation/merge-options.txt15
-rw-r--r--Documentation/merge-strategies.txt6
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/pretty-options.txt2
-rw-r--r--Documentation/rev-list-options.txt17
-rw-r--r--Documentation/revisions.txt4
-rw-r--r--Documentation/technical/api-builtin.txt13
-rw-r--r--Documentation/technical/api-gitattributes.txt2
-rw-r--r--Documentation/technical/api-hash.txt52
-rw-r--r--Documentation/technical/api-hashmap.txt234
-rw-r--r--Documentation/technical/api-parse-options.txt4
-rw-r--r--Documentation/technical/api-strbuf.txt9
-rw-r--r--Documentation/technical/bitmap-format.txt164
-rw-r--r--Documentation/technical/http-protocol.txt6
-rw-r--r--Documentation/technical/pack-protocol.txt11
-rw-r--r--Documentation/technical/protocol-capabilities.txt18
-rw-r--r--Documentation/technical/protocol-common.txt2
-rw-r--r--Documentation/user-manual.txt6
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile81
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--archive.c17
-rw-r--r--attr.c7
-rw-r--r--bisect.c5
-rw-r--r--block-sha1/sha1.c32
-rw-r--r--branch.c56
-rw-r--r--builtin/add.c204
-rw-r--r--builtin/apply.c28
-rw-r--r--builtin/blame.c977
-rw-r--r--builtin/branch.c2
-rw-r--r--builtin/cat-file.c15
-rw-r--r--builtin/check-attr.c3
-rw-r--r--builtin/checkout.c25
-rw-r--r--builtin/clean.c53
-rw-r--r--builtin/clone.c13
-rw-r--r--builtin/commit-tree.c12
-rw-r--r--builtin/commit.c196
-rw-r--r--builtin/config.c104
-rw-r--r--builtin/describe.c55
-rw-r--r--builtin/fetch.c2
-rw-r--r--builtin/for-each-ref.c2
-rw-r--r--builtin/fsck.c8
-rw-r--r--builtin/gc.c38
-rw-r--r--builtin/grep.c13
-rw-r--r--builtin/index-pack.c42
-rw-r--r-