summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--Documentation/Makefile14
-rw-r--r--Documentation/RelNotes/1.7.10.2.txt85
-rw-r--r--Documentation/RelNotes/1.7.10.3.txt43
-rw-r--r--Documentation/RelNotes/1.7.10.4.txt29
-rw-r--r--Documentation/RelNotes/1.7.10.5.txt12
-rw-r--r--Documentation/RelNotes/1.7.11.1.txt9
-rw-r--r--Documentation/RelNotes/1.7.11.2.txt53
-rw-r--r--Documentation/RelNotes/1.7.11.3.txt53
-rw-r--r--Documentation/RelNotes/1.7.11.4.txt31
-rw-r--r--Documentation/RelNotes/1.7.11.txt139
-rw-r--r--Documentation/asciidoc.conf4
-rw-r--r--Documentation/config.txt127
-rw-r--r--Documentation/diff-config.txt2
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt4
-rw-r--r--Documentation/everyday.txt4
-rw-r--r--Documentation/git-am.txt3
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt14
-rw-r--r--Documentation/git-bundle.txt8
-rw-r--r--Documentation/git-check-ref-format.txt12
-rw-r--r--Documentation/git-checkout.txt8
-rw-r--r--Documentation/git-cherry-pick.txt36
-rw-r--r--Documentation/git-column.txt53
-rw-r--r--Documentation/git-commit-tree.txt11
-rw-r--r--Documentation/git-commit.txt13
-rw-r--r--Documentation/git-config.txt18
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-difftool.txt17
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-fast-import.txt48
-rw-r--r--Documentation/git-filter-branch.txt34
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-gc.txt2
-rw-r--r--Documentation/git-grep.txt8
-rw-r--r--Documentation/git-index-pack.txt10
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-mergetool.txt6
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-p4.txt76
-rw-r--r--Documentation/git-pack-refs.txt2
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt28
-rw-r--r--Documentation/git-rebase.txt16
-rw-r--r--Documentation/git-reflog.txt6
-rw-r--r--Documentation/git-remote-helpers.txt8
-rw-r--r--Documentation/git-remote.txt6
-rw-r--r--Documentation/git-rerere.txt6
-rw-r--r--Documentation/git-reset.txt2
-rw-r--r--Documentation/git-rev-parse.txt10
-rw-r--r--Documentation/git-revert.txt4
-rw-r--r--Documentation/git-rm.txt3
-rw-r--r--Documentation/git-shortlog.txt2
-rw-r--r--Documentation/git-show-ref.txt2
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/git-stash.txt18
-rw-r--r--Documentation/git-status.txt13
-rw-r--r--Documentation/git-submodule.txt13
-rw-r--r--Documentation/git-svn.txt41
-rw-r--r--Documentation/git-tag.txt9
-rw-r--r--Documentation/git-tar-tree.txt2
-rw-r--r--Documentation/git-update-index.txt6
-rw-r--r--Documentation/git-var.txt21
-rw-r--r--Documentation/git-whatchanged.txt2
-rw-r--r--Documentation/git.txt17
-rw-r--r--Documentation/gitcli.txt12
-rw-r--r--Documentation/gitcore-tutorial.txt32
-rw-r--r--Documentation/gitcredentials.txt4
-rw-r--r--Documentation/gitdiffcore.txt10
-rw-r--r--Documentation/githooks.txt8
-rw-r--r--Documentation/gitmodules.txt5
-rw-r--r--Documentation/gitweb.conf.txt21
-rw-r--r--Documentation/gitworkflows.txt4
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/pretty-formats.txt6
-rw-r--r--Documentation/pull-fetch-param.txt2
-rw-r--r--Documentation/rev-list-options.txt9
-rw-r--r--Documentation/revisions.txt43
-rw-r--r--Documentation/technical/api-argv-array.txt5
-rw-r--r--Documentation/technical/api-credentials.txt68
-rw-r--r--Documentation/technical/api-parse-options.txt36
-rw-r--r--Documentation/technical/api-revision-walking.txt5
-rw-r--r--Documentation/technical/index-format.txt13
-rw-r--r--Documentation/technical/pack-protocol.txt4
-rw-r--r--Documentation/technical/protocol-common.txt2
-rw-r--r--Documentation/user-manual.txt22
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL9
-rw-r--r--Makefile122
l---------RelNotes2
-rw-r--r--advice.c8
-rw-r--r--advice.h3
-rw-r--r--archive-tar.c213
-rw-r--r--archive-zip.c200
-rw-r--r--archive.c45
-rw-r--r--archive.h10
-rw-r--r--argv-array.c14
-rw-r--r--argv-array.h3
-rw-r--r--bisect.c8
-rw-r--r--branch.c9
-rw-r--r--branch.h2
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c8
-rw-r--r--builtin/apply.c469
-rw-r--r--builtin/blame.c78
-rw-r--r--builtin/branch.c102
-rw-r--r--builtin/cat-file.c25
-rw-r--r--builtin/checkout.c24
-rw-r--r--builtin/clone.c11
-rw-r--r--builtin/column.c59
-rw-r--r--builtin/commit-tree.c3
-rw-r--r--builtin/commit.c90
-rw-r--r--builtin/diff.c24
-rw-r--r--builtin/fast-export.c4
-rw-r--r--builtin/fetch-pack.c197
-rw-r--r--builtin/fetch.c4
-rw-r--r--builtin/fmt-merge-msg.c122
-rw-r--r--builtin/fsck.c8
-rw-r--r--builtin/gc.c89
-rw-r--r--builtin/grep.c9
-rw-r--r--builtin/help.c53
-rw-r--r--builtin/index-pack.c458
-rw-r--r--builtin/log.c83
-rw-r--r--builtin/ls-files.c23
-rw-r--r--builtin/merge-file.c4
-rw-r--r--builtin/merge.c4
-rw-r--r--