summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--Documentation/CodingGuidelines25
-rw-r--r--Documentation/Makefile12
-rw-r--r--Documentation/RelNotes/1.9.0.txt345
-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.0.1.txt115
-rw-r--r--Documentation/RelNotes/2.0.2.txt13
-rw-r--r--Documentation/config.txt125
-rw-r--r--Documentation/diff-config.txt5
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt5
-rw-r--r--Documentation/everyday.txt2
-rw-r--r--Documentation/fetch-options.txt40
-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-blame.txt3
-rw-r--r--Documentation/git-cat-file.txt12
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/git-cherry-pick.txt7
-rw-r--r--Documentation/git-clone.txt20
-rw-r--r--Documentation/git-column.txt5
-rw-r--r--Documentation/git-commit-tree.txt5
-rw-r--r--Documentation/git-commit.txt14
-rw-r--r--Documentation/git-count-objects.txt4
-rw-r--r--Documentation/git-cvsimport.txt4
-rw-r--r--Documentation/git-diff.txt6
-rw-r--r--Documentation/git-fetch.txt17
-rw-r--r--Documentation/git-filter-branch.txt33
-rw-r--r--Documentation/git-for-each-ref.txt24
-rw-r--r--Documentation/git-gc.txt3
-rw-r--r--Documentation/git-http-backend.txt10
-rw-r--r--Documentation/git-lost-found.txt74
-rw-r--r--Documentation/git-merge-base.txt38
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-mv.txt12
-rw-r--r--Documentation/git-notes.txt12
-rw-r--r--Documentation/git-p4.txt6
-rw-r--r--Documentation/git-pack-objects.txt5
-rw-r--r--Documentation/git-peek-remote.txt43
-rw-r--r--Documentation/git-prune.txt4
-rw-r--r--Documentation/git-push.txt21
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt14
-rw-r--r--Documentation/git-remote-ext.txt5
-rw-r--r--Documentation/git-remote-fd.txt4
-rw-r--r--Documentation/git-remote.txt2
-rw-r--r--Documentation/git-repack.txt17
-rw-r--r--Documentation/git-replace.txt19
-rw-r--r--Documentation/git-repo-config.txt23
-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.txt60
-rw-r--r--Documentation/git-revert.txt6
-rw-r--r--Documentation/git-rm.txt9
-rw-r--r--Documentation/git-shell.txt2
-rw-r--r--Documentation/git-show-branch.txt2
-rw-r--r--Documentation/git-show-ref.txt3
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt2
-rw-r--r--Documentation/git-submodule.txt27
-rw-r--r--Documentation/git-svn.txt23
-rw-r--r--Documentation/git-tag.txt11
-rw-r--r--Documentation/git-tar-tree.txt82
-rw-r--r--Documentation/git-update-index.txt8
-rw-r--r--Documentation/git-upload-archive.txt32
-rw-r--r--Documentation/git.txt29
-rw-r--r--Documentation/gitattributes.txt9
-rw-r--r--Documentation/gitcli.txt8
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcvs-migration.txt2
-rw-r--r--Documentation/githooks.txt2
-rw-r--r--Documentation/gitignore.txt24
-rw-r--r--Documentation/gitk.txt26
-rw-r--r--Documentation/gitmodules.txt4
-rw-r--r--Documentation/gitremote-helpers.txt11
-rw-r--r--Documentation/gitrepository-layout.txt4
-rw-r--r--Documentation/gitweb.conf.txt41
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/glossary-content.txt38
-rwxr-xr-xDocumentation/howto-index.sh12
-rw-r--r--Documentation/howto/maintain-git.txt18
-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
-rwxr-xr-xDocumentation/install-webdoc.sh6
-rw-r--r--Documentation/merge-options.txt15
-rw-r--r--Documentation/merge-strategies.txt14
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/pretty-options.txt2
-rw-r--r--Documentation/rev-list-options.txt32
-rw-r--r--Documentation/revisions.txt2
-rw-r--r--Documentation/technical/api-builtin.txt4
-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.txt10
-rw-r--r--Documentation/technical/api-remote.txt20
-rw-r--r--Documentation/technical/bitmap-format.txt164
-rw-r--r--Documentation/technical/http-protocol.txt229
-rw-r--r--Documentation/technical/pack-protocol.txt18
-rw-r--r--Documentation/technical/protocol-capabilities.txt49
-rw-r--r--Documentation/technical/protocol-common.txt2
-rw-r--r--Documentation/user-manual.txt6
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile102
l---------RelNotes2
-rw-r--r--abspath.c18
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--alias.c2
-rw-r--r--alloc.c23
-rw-r--r--archive.c17
-rw-r--r--attr.c9
-rw-r--r--bisect.c9
-rw-r--r--block-sha1/sha1.c32
-rw-r--r--branch.c58
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c209
-rw-r--r--builtin/annotate.c12
-rw-r--r--builtin/apply.c40
-rw-r--r--builtin/archive.c4
-rw-r--r--builtin/blame.c155