summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--.mailmap192
-rw-r--r--Documentation/Makefile44
-rw-r--r--Documentation/RelNotes/1.7.10.1.txt2
-rw-r--r--Documentation/RelNotes/1.7.5.4.txt2
-rw-r--r--Documentation/RelNotes/1.7.8.2.txt4
-rw-r--r--Documentation/RelNotes/1.7.8.txt4
-rw-r--r--Documentation/RelNotes/1.8.2.1.txt2
-rw-r--r--Documentation/RelNotes/1.8.2.2.txt2
-rw-r--r--Documentation/RelNotes/1.8.3.1.txt14
-rw-r--r--Documentation/RelNotes/1.8.3.2.txt59
-rw-r--r--Documentation/RelNotes/1.8.3.3.txt47
-rw-r--r--Documentation/RelNotes/1.8.3.4.txt20
-rw-r--r--Documentation/RelNotes/1.8.4.txt488
-rw-r--r--Documentation/blame-options.txt25
-rw-r--r--Documentation/config.txt155
-rw-r--r--Documentation/diff-options.txt50
-rw-r--r--Documentation/fetch-options.txt2
-rw-r--r--Documentation/git-am.txt4
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-blame.txt6
-rw-r--r--Documentation/git-cat-file.txt79
-rw-r--r--Documentation/git-check-attr.txt5
-rw-r--r--Documentation/git-check-ignore.txt22
-rw-r--r--Documentation/git-check-mailmap.txt47
-rw-r--r--Documentation/git-check-ref-format.txt2
-rw-r--r--Documentation/git-checkout.txt6
-rw-r--r--Documentation/git-clean.txt71
-rw-r--r--Documentation/git-clone.txt19
-rw-r--r--Documentation/git-config.txt60
-rw-r--r--Documentation/git-describe.txt9
-rw-r--r--Documentation/git-diff-index.txt12
-rw-r--r--Documentation/git-diff.txt14
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-format-patch.txt15
-rw-r--r--Documentation/git-gc.txt5
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-log.txt30
-rw-r--r--Documentation/git-ls-remote.txt11
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-name-rev.txt9
-rw-r--r--Documentation/git-p4.txt17
-rw-r--r--Documentation/git-pack-refs.txt4
-rw-r--r--Documentation/git-prune.txt2
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt16
-rw-r--r--Documentation/git-rebase.txt14
-rw-r--r--Documentation/git-reflog.txt9
-rw-r--r--Documentation/git-remote.txt25
-rw-r--r--Documentation/git-reset.txt2
-rw-r--r--Documentation/git-rev-parse.txt18
-rw-r--r--Documentation/git-send-email.txt6
-rw-r--r--Documentation/git-show-ref.txt10
-rw-r--r--Documentation/git-show.txt9
-rw-r--r--Documentation/git-stash.txt25
-rw-r--r--Documentation/git-submodule.txt16
-rw-r--r--Documentation/git-tag.txt11
-rw-r--r--Documentation/git-web--browse.txt1
-rw-r--r--Documentation/git.txt37
-rw-r--r--Documentation/gitdiffcore.txt45
-rw-r--r--Documentation/gitremote-helpers.txt12
-rw-r--r--Documentation/gitrepository-layout.txt3
-rw-r--r--Documentation/gitweb.conf.txt22
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/glossary-content.txt17
-rw-r--r--Documentation/howto/revert-branch-rebase.txt2
-rw-r--r--Documentation/line-range-format.txt25
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/pull-fetch-param.txt11
-rw-r--r--Documentation/rev-list-options.txt49
-rw-r--r--Documentation/revisions.txt3
-rw-r--r--Documentation/technical/api-builtin.txt2
-rw-r--r--Documentation/technical/api-parse-options.txt18
-rw-r--r--Documentation/technical/index-format.txt2
-rw-r--r--Documentation/technical/pack-protocol.txt3
-rw-r--r--Documentation/technical/protocol-capabilities.txt40
-rw-r--r--Documentation/technical/racy-git.txt8
-rw-r--r--Documentation/urls.txt11
-rw-r--r--Documentation/user-manual.txt59
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile136
l---------RelNotes2
-rw-r--r--abspath.c2
-rw-r--r--advice.c4
-rw-r--r--advice.h3
-rw-r--r--archive-zip.c1
-rw-r--r--argv-array.h1
-rw-r--r--bisect.c5
-rw-r--r--branch.c17
-rw-r--r--builtin.h20
-rw-r--r--builtin/add.c1
-rw-r--r--builtin/apply.c23
-rw-r--r--builtin/blame.c99
-rw-r--r--builtin/cat-file.c220
-rw-r--r--builtin/check-ignore.c92
-rw-r--r--builtin/check-mailmap.c66
-rw-r--r--builtin/checkout.c64
-rw-r--r--builtin/clean.c804
-rw-r--r--builtin/clone.c30
-rw-r--r--builtin/commit.c124
-rw-r--r--builtin/config.c40
-rw-r--r--builtin/describe.c42
-rw-r--r--builtin/diff.c69
-rw-r--r--builtin/fast-export.c22
-rw-r--r--builtin/fetch.c102
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/grep.c7
-rw-r--r--builtin/help.c2
-rw-r--r--builtin/index-pack.c38
-rw-r--r--builtin/log.c57
-rw-r--r--builtin/ls-files.c48
-rw-r--r--builtin/merge-base.c2
-rw-r--r--builtin/merge-index.c4
-rw-r--r--builtin/merge.c64
-rw-r--r--builtin/name-rev.c149
-rw-r--r--builtin/notes.c138
-rw-r--r--builtin/pack-refs.c2
-rw-r--r--builtin/prune-packed.c15
-rw-r--r--builtin/prune.c6
-rw-r--r--builtin/push.c66
-rw-r--r--builtin/read-tree.c5
-rw-r--r--builtin/reflog.c14
-rw-r--r--builtin/replace.c2
-rw-r--r--builtin/reset.c5
-rw-r--r--builtin/rev-list.c1
-rw-r--r--builtin/rev-parse.c24
-rw-r--r--builtin/revert.c2
-rw-r--r--builtin/rm.c9
-rw-r--r--builtin/shortlog.c1
-rw-r--r--builtin/show-branch.c16