summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--.mailmap8
-rw-r--r--Documentation/Makefile12
-rw-r--r--Documentation/RelNotes/1.7.10.1.txt78
-rw-r--r--Documentation/RelNotes/1.7.10.2.txt85
-rw-r--r--Documentation/RelNotes/1.7.10.3.txt26
-rw-r--r--Documentation/RelNotes/1.7.10.txt219
-rw-r--r--Documentation/RelNotes/1.7.11.txt130
-rw-r--r--Documentation/RelNotes/1.7.7.7.txt13
-rw-r--r--Documentation/RelNotes/1.7.8.6.txt22
-rw-r--r--Documentation/RelNotes/1.7.9.7.txt13
-rw-r--r--Documentation/config.txt137
-rw-r--r--Documentation/diff-config.txt4
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt31
-rw-r--r--Documentation/everyday.txt4
-rw-r--r--Documentation/git-am.txt6
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt33
-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.txt23
-rw-r--r--Documentation/git-clone.txt16
-rw-r--r--Documentation/git-column.txt53
-rw-r--r--Documentation/git-commit.txt17
-rw-r--r--Documentation/git-config.txt19
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-difftool.txt16
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-fast-import.txt48
-rw-r--r--Documentation/git-fetch-pack.txt10
-rw-r--r--Documentation/git-filter-branch.txt34
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-fsck.txt7
-rw-r--r--Documentation/git-gc.txt2
-rw-r--r--Documentation/git-grep.txt4
-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-notes.txt2
-rw-r--r--Documentation/git-p4.txt72
-rw-r--r--Documentation/git-pack-refs.txt2
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt36
-rw-r--r--Documentation/git-rebase.txt14
-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-repack.txt2
-rw-r--r--Documentation/git-rerere.txt6
-rw-r--r--Documentation/git-reset.txt2
-rw-r--r--Documentation/git-rev-parse.txt7
-rw-r--r--Documentation/git-revert.txt4
-rw-r--r--Documentation/git-rm.txt3
-rw-r--r--Documentation/git-send-email.txt4
-rw-r--r--Documentation/git-sh-i18n--envsubst.txt2
-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.txt15
-rw-r--r--Documentation/git-svn.txt41
-rw-r--r--Documentation/git-symbolic-ref.txt7
-rw-r--r--Documentation/git-tag.txt15
-rw-r--r--Documentation/git-tar-tree.txt2
-rw-r--r--Documentation/git-update-index.txt6
-rw-r--r--Documentation/git-var.txt12
-rw-r--r--Documentation/git-whatchanged.txt2
-rw-r--r--Documentation/git.txt16
-rw-r--r--Documentation/gitattributes.txt41
-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.txt9
-rw-r--r--Documentation/gitweb.conf.txt19
-rw-r--r--Documentation/gitworkflows.txt4
-rw-r--r--Documentation/howto/using-merge-subtree.txt2
-rw-r--r--Documentation/merge-options.txt17
-rw-r--r--Documentation/pretty-formats.txt6
-rw-r--r--Documentation/pull-fetch-param.txt2
-rw-r--r--Documentation/rev-list-options.txt6
-rw-r--r--Documentation/technical/api-argv-array.txt5
-rw-r--r--Documentation/technical/api-config.txt140
-rw-r--r--Documentation/technical/api-parse-options.txt37
-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.txt23
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--INSTALL3
-rw-r--r--Makefile171
l---------RelNotes2
-rw-r--r--advice.c20
-rw-r--r--advice.h4
-rw-r--r--archive-tar.c207
-rw-r--r--archive-zip.c200
-rw-r--r--archive.c28
-rw-r--r--archive.h10
-rw-r--r--argv-array.c14
-rw-r--r--argv-array.h3
-rw-r--r--attr.h2
-rw-r--r--bisect.c8
-rw-r--r--branch.c9
-rw-r--r--branch.h2
-rw-r--r--builtin.h1
-rw-r--r--builtin/apply.c455
-rw-r--r--builtin/blame.c80
-rw-r--r--builtin/branch.c102
-rw-r--r--builtin/cat-file.c33
-rw-r--r--builtin/checkout.c32
-rw-r--r--builtin/clone.c349
-rw-r--r--builtin/column.c59
-rw-r--r--builtin/commit.c294
-rw-r--r--builtin/config.c96
-rw-r--r--builtin/diff.c6
-rw-r--r--builtin/fast-export.c4
-rw-r--r--builtin/fetch-pack.c65
-rw-r--r--builtin/fetch.c29
-rw-r--r--builtin/fmt-merge-msg.c242
-rw-r--r--builtin/fsck.c15
-rw-r--r--builtin/gc.c89
-rw-r--r--builtin/grep.c12
-rw-r--r--builtin/help.c53
-rw-r--r--