summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/CodingGuidelines21
-rw-r--r--Documentation/RelNotes/2.4.0.txt475
-rw-r--r--Documentation/blame-options.txt2
-rw-r--r--Documentation/config.txt274
-rw-r--r--Documentation/diff-config.txt10
-rw-r--r--Documentation/diff-options.txt4
-rw-r--r--Documentation/fetch-options.txt2
-rw-r--r--Documentation/git-add.txt4
-rw-r--r--Documentation/git-apply.txt2
-rw-r--r--Documentation/git-branch.txt6
-rw-r--r--Documentation/git-check-ignore.txt2
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/git-commit-tree.txt2
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-config.txt2
-rw-r--r--Documentation/git-cvsserver.txt22
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-gc.txt12
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-instaweb.txt2
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-p4.txt6
-rw-r--r--Documentation/git-pull.txt7
-rw-r--r--Documentation/git-push.txt26
-rw-r--r--Documentation/git-rebase.txt6
-rw-r--r--Documentation/git-receive-pack.txt2
-rw-r--r--Documentation/git-reflog.txt144
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-send-email.txt50
-rw-r--r--Documentation/git-send-pack.txt7
-rw-r--r--Documentation/git-status.txt4
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git.txt2
-rw-r--r--Documentation/gitattributes.txt2
-rw-r--r--Documentation/gitcredentials.txt2
-rw-r--r--Documentation/githooks.txt30
-rw-r--r--Documentation/gitignore.txt4
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/pretty-options.txt10
-rw-r--r--Documentation/rev-list-options.txt13
-rw-r--r--Documentation/technical/api-error-handling.txt75
-rw-r--r--Documentation/technical/api-strbuf.txt351
-rw-r--r--Documentation/technical/protocol-capabilities.txt13
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile23
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--archive-zip.c25
-rw-r--r--archive.c4
-rw-r--r--attr.c47
-rw-r--r--branch.c5
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/apply.c9
-rw-r--r--builtin/blame.c4
-rw-r--r--builtin/branch.c21
-rw-r--r--builtin/cat-file.c4
-rw-r--r--builtin/check-attr.c4
-rw-r--r--builtin/check-ignore.c4
-rw-r--r--builtin/check-mailmap.c2
-rw-r--r--builtin/check-ref-format.c2
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c8
-rw-r--r--builtin/clean.c3
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/column.c2
-rw-r--r--builtin/commit.c14
-rw-r--r--builtin/config.c2
-rw-r--r--builtin/describe.c4
-rw-r--r--builtin/diff-files.c2
-rw-r--r--builtin/diff-index.c2
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/fetch-pack.c2
-rw-r--r--builtin/fetch.c6
-rw-r--r--builtin/fmt-merge-msg.c2
-rw-r--r--builtin/for-each-ref.c2
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/grep.c2
-rw-r--r--builtin/hash-object.c2
-rw-r--r--builtin/help.c7
-rw-r--r--builtin/init-db.c2
-rw-r--r--builtin/log.c4
-rw-r--r--builtin/ls-files.c45
-rw-r--r--builtin/ls-remote.c2
-rw-r--r--builtin/mailinfo.c2
-rw-r--r--builtin/merge-base.c4
-rw-r--r--builtin/merge-file.c4
-rw-r--r--builtin/merge-index.c2
-rw-r--r--builtin/merge.c4
-rw-r--r--builtin/mv.c2
-rw-r--r--builtin/name-rev.c6
-rw-r--r--builtin/notes.c24
-rw-r--r--builtin/pack-redundant.c2
-rw-r--r--builtin/pack-refs.c2
-rw-r--r--builtin/prune-packed.c2
-rw-r--r--builtin/push.c16
-rw-r--r--builtin/receive-pack.c234
-rw-r--r--builtin/reflog.c268
-rw-r--r--builtin/remote.c4
-rw-r--r--builtin/repack.c2
-rw-r--r--builtin/replace.c2
-rw-r--r--builtin/rerere.c2
-rw-r--r--builtin/rev-parse.c6
-rw-r--r--builtin/revert.c4
-rw-r--r--builtin/rm.c2
-rw-r--r--builtin/send-pack.c6
-rw-r--r--builtin/shortlog.c2
-rw-r--r--builtin/show-branch.c4
-rw-r--r--builtin/show-ref.c2
-rw-r--r--builtin/symbolic-ref.c4
-rw-r--r--builtin/tag.c6
-rw-r--r--builtin/update-index.c3
-rw-r--r--builtin/update-ref.c26
-rw-r--r--builtin/verify-commit.c2
-rw-r--r--builtin/verify-pack.c2
-rw-r--r--builtin/verify-tag.c2
-rw-r--r--bundle.c11
-rw-r--r--cache.h3
-rwxr-xr-xcheck-builtins.sh2
-rw-r--r--commit.h1
-rw-r--r--config.mak.uname5
-rw-r--r--configure.ac23
-rw-r--r--connect.c1
-rw-r--r--contrib/completion/git-completion.bash3
-rw-r--r--credential-store.c2
-rw-r--r--daemon.c165
-rw-r--r--diff-lib.c8<