summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Documentation/CodingGuidelines171
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/2.0.0.txt364
-rw-r--r--Documentation/RelNotes/2.0.1.txt115
-rw-r--r--Documentation/RelNotes/2.1.0.txt301
-rw-r--r--Documentation/config.txt148
-rw-r--r--Documentation/diff-config.txt2
-rw-r--r--Documentation/fetch-options.txt8
-rw-r--r--Documentation/git-add.txt34
-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-cvsimport.txt4
-rw-r--r--Documentation/git-daemon.txt6
-rw-r--r--Documentation/git-fast-export.txt4
-rw-r--r--Documentation/git-fast-import.txt13
-rw-r--r--Documentation/git-fetch.txt90
-rw-r--r--Documentation/git-filter-branch.txt4
-rw-r--r--Documentation/git-format-patch.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-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-patch-id.txt37
-rw-r--r--Documentation/git-push.txt10
-rw-r--r--Documentation/git-read-tree.txt2
-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-replace.txt16
-rw-r--r--Documentation/git-request-pull.txt55
-rw-r--r--Documentation/git-reset.txt5
-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.txt18
-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.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.txt19
-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/gitmodules.txt4
-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.txt6
-rwxr-xr-xDocumentation/howto-index.sh12
-rw-r--r--Documentation/howto/keep-canonical-history-correct.txt216
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt2
-rwxr-xr-xDocumentation/install-webdoc.sh6
-rw-r--r--Documentation/merge-strategies.txt2
-rw-r--r--Documentation/pull-fetch-param.txt81
-rw-r--r--Documentation/rev-list-options.txt15
-rw-r--r--Documentation/revisions.txt4
-rw-r--r--Documentation/technical/api-argv-array.txt8
-rw-r--r--Documentation/technical/api-builtin.txt13
-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-run-command.txt7
-rw-r--r--Documentation/technical/api-strbuf.txt28
-rw-r--r--Documentation/technical/api-string-list.txt2
-rw-r--r--Documentation/technical/bitmap-format.txt164
-rw-r--r--Documentation/technical/http-protocol.txt8
-rw-r--r--Documentation/user-manual.txt19
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile71
l---------RelNotes2
-rw-r--r--advice.c11
-rw-r--r--advice.h1
-rw-r--r--alloc.c23
-rw-r--r--archive.c17
-rw-r--r--argv-array.c20
-rw-r--r--argv-array.h2
-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.c201
-rw-r--r--builtin/apply.c26
-rw-r--r--builtin/blame.c995
-rw-r--r--builtin/branch.c2
-rw-r--r--builtin/cat-file.c15
-rw-r--r--builtin/checkout.c12
-rw-r--r--builtin/clean.c5
-rw-r--r--builtin/clone.c9
-rw-r--r--builtin/commit-tree.c16
-rw-r--r--builtin/commit.c179
-rw-r--r--builtin/config.c119
-rw-r--r--builtin/describe.c55
-rw-r--r--builtin/fast-export.c54
-rw-r--r--builtin/fetch.c37
-rw-r--r--builtin/fmt-merge-msg.c5
-rw-r--r--builtin/for-each-ref.c4
-rw-r--r--builtin/fsck.c11
-rw-r--r--builtin/gc.c60
-rw-r--r--builtin/grep.c7
-rw-r--r--builtin/index-pack.c41
-rw-r--r--builtin/init-db.c8
-rw-r--r--builtin/log.c49
-rw-r--r--builtin/ls-remote.c4
-rw-r--r--builtin/mailinfo.c6
-rw-r--r--builtin/merge.c21
-rw-r--r--builtin/mktree.c5
-rw-r--r--builtin/mv.c6
-rw-r--r--builtin/name-rev.c2
-rw-r--r--builtin/notes.c14
-rw-r--r--