summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--Documentation/CodingGuidelines6
-rw-r--r--Documentation/Makefile44
-rw-r--r--Documentation/RelNotes/1.8.3.1.txt14
-rw-r--r--Documentation/RelNotes/1.8.3.txt436
-rw-r--r--Documentation/RelNotes/1.8.4.txt286
-rw-r--r--Documentation/blame-options.txt21
-rw-r--r--Documentation/config.txt71
-rw-r--r--Documentation/diff-options.txt38
-rw-r--r--Documentation/fetch-options.txt2
-rw-r--r--Documentation/git-add.txt20
-rw-r--r--Documentation/git-am.txt7
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-blame.txt6
-rw-r--r--Documentation/git-check-attr.txt5
-rw-r--r--Documentation/git-check-ignore.txt20
-rw-r--r--Documentation/git-check-ref-format.txt5
-rw-r--r--Documentation/git-checkout.txt12
-rw-r--r--Documentation/git-clone.txt4
-rw-r--r--Documentation/git-commit-tree.txt7
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt12
-rw-r--r--Documentation/git-count-objects.txt30
-rw-r--r--Documentation/git-daemon.txt9
-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-difftool.txt11
-rw-r--r--Documentation/git-fast-export.txt22
-rw-r--r--Documentation/git-fetch-pack.txt6
-rw-r--r--Documentation/git-fmt-merge-msg.txt3
-rw-r--r--Documentation/git-format-patch.txt5
-rw-r--r--Documentation/git-fsck.txt6
-rw-r--r--Documentation/git-gc.txt5
-rw-r--r--Documentation/git-grep.txt2
-rw-r--r--Documentation/git-help.txt28
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-log.txt44
-rw-r--r--Documentation/git-mailinfo.txt2
-rw-r--r--Documentation/git-merge.txt7
-rw-r--r--Documentation/git-mergetool.txt2
-rw-r--r--Documentation/git-push.txt27
-rw-r--r--Documentation/git-rebase.txt10
-rw-r--r--Documentation/git-reflog.txt9
-rw-r--r--Documentation/git-remote.txt2
-rw-r--r--Documentation/git-rev-parse.txt19
-rw-r--r--Documentation/git-revert.txt2
-rw-r--r--Documentation/git-rm.txt4
-rw-r--r--Documentation/git-send-email.txt9
-rw-r--r--Documentation/git-sh-setup.txt6
-rw-r--r--Documentation/git-shell.txt82
-rw-r--r--Documentation/git-shortlog.txt23
-rw-r--r--Documentation/git-stash.txt13
-rw-r--r--Documentation/git-submodule.txt26
-rw-r--r--Documentation/git-svn.txt48
-rw-r--r--Documentation/git-update-index.txt10
-rw-r--r--Documentation/git-web--browse.txt1
-rw-r--r--Documentation/git.txt34
-rw-r--r--Documentation/gitdiffcore.txt45
-rw-r--r--Documentation/gitremote-helpers.txt12
-rw-r--r--Documentation/gitrepository-layout.txt7
-rw-r--r--Documentation/glossary-content.txt13
-rw-r--r--Documentation/line-range-format.txt25
-rw-r--r--Documentation/merge-options.txt8
-rw-r--r--Documentation/pretty-formats.txt38
-rw-r--r--Documentation/pull-fetch-param.txt11
-rw-r--r--Documentation/rev-list-options.txt42
-rw-r--r--Documentation/revisions.txt14
-rw-r--r--Documentation/technical/api-builtin.txt2
-rw-r--r--Documentation/technical/api-directory-listing.txt25
-rw-r--r--Documentation/technical/api-parse-options.txt18
-rw-r--r--Documentation/technical/api-strbuf.txt5
-rw-r--r--Documentation/technical/pack-protocol.txt3
-rw-r--r--Documentation/urls.txt8
-rw-r--r--Documentation/user-manual.txt19
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile165
l---------RelNotes2
-rw-r--r--abspath.c2
-rw-r--r--advice.c6
-rw-r--r--advice.h3
-rw-r--r--archive-zip.c37
-rw-r--r--attr.c35
-rw-r--r--bisect.c5
-rw-r--r--branch.c100
-rw-r--r--builtin.h19
-rw-r--r--builtin/add.c241
-rw-r--r--builtin/apply.c4
-rw-r--r--builtin/archive.c17
-rw-r--r--builtin/blame.c101
-rw-r--r--builtin/branch.c66
-rw-r--r--builtin/check-ignore.c97
-rw-r--r--builtin/checkout.c95
-rw-r--r--builtin/clone.c86
-rw-r--r--builtin/commit-tree.c2
-rw-r--r--builtin/commit.c17
-rw-r--r--builtin/config.c9
-rw-r--r--builtin/count-objects.c72
-rw-r--r--builtin/describe.c11
-rw-r--r--builtin/diff.c69
-rw-r--r--builtin/fast-export.c61
-rw-r--r--builtin/fetch-pack.c49
-rw-r--r--builtin/fetch.c102
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/help.c48
-rw-r--r--builtin/index-pack.c38
-rw-r--r--builtin/log.c215
-rw-r--r--builtin/ls-files.c23
-rw-r--r--builtin/merge-base.c2
-rw-r--r--builtin/merge-tree.c32
-rw-r--r--builtin/merge.c40
-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.c25
-rw-r--r--builtin/read-tree.c5
-rw-r--r--builtin/receive-pack.c10
-rw-r--r--builtin/reflog.c14
-rw-r--r--builtin/replace.c2
-rw-r--r--builtin/rm.c103
-rw-r--r--builtin/send-pack.c4
-rw-r--r--builtin/shortlog.c4
-rw-r--r--builtin/show-ref.c2
-rw-r--r--builtin/upload-archive.c45
-rw-r--r--bundle.c2
-rw-r--r--cache.h48
-rw-r--r--color.c2
-rw-r--r--combine-diff.c265
-rw-r--r--commit.c112
-rw-r--r--