summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--.travis.yml2
-rw-r--r--Documentation/CodingGuidelines14
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/2.9.1.txt117
-rw-r--r--Documentation/RelNotes/2.9.2.txt13
-rw-r--r--Documentation/RelNotes/2.9.3.txt58
-rw-r--r--Documentation/config.txt124
-rw-r--r--Documentation/date-formats.txt2
-rw-r--r--Documentation/diff-config.txt4
-rw-r--r--Documentation/diff-format.txt8
-rw-r--r--Documentation/diff-generate-patch.txt8
-rw-r--r--Documentation/fetch-options.txt8
-rw-r--r--Documentation/git-am.txt4
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-bisect.txt4
-rw-r--r--Documentation/git-branch.txt6
-rw-r--r--Documentation/git-cat-file.txt12
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-clean.txt2
-rw-r--r--Documentation/git-clone.txt5
-rw-r--r--Documentation/git-commit-tree.txt2
-rw-r--r--Documentation/git-commit.txt10
-rw-r--r--Documentation/git-config.txt30
-rw-r--r--Documentation/git-credential-store.txt2
-rw-r--r--Documentation/git-cvsimport.txt12
-rw-r--r--Documentation/git-cvsserver.txt12
-rw-r--r--Documentation/git-daemon.txt10
-rw-r--r--Documentation/git-describe.txt2
-rw-r--r--Documentation/git-diff-index.txt4
-rw-r--r--Documentation/git-diff-tree.txt20
-rw-r--r--Documentation/git-difftool.txt2
-rw-r--r--Documentation/git-fast-import.txt4
-rw-r--r--Documentation/git-fetch-pack.txt4
-rw-r--r--Documentation/git-filter-branch.txt8
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-format-patch.txt6
-rw-r--r--Documentation/git-fsck.txt2
-rw-r--r--Documentation/git-gc.txt16
-rw-r--r--Documentation/git-grep.txt12
-rw-r--r--Documentation/git-gui.txt2
-rw-r--r--Documentation/git-help.txt32
-rw-r--r--Documentation/git-http-backend.txt8
-rw-r--r--Documentation/git-http-push.txt4
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-instaweb.txt4
-rw-r--r--Documentation/git-interpret-trailers.txt2
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-ls-tree.txt8
-rw-r--r--Documentation/git-mktree.txt2
-rw-r--r--Documentation/git-mv.txt4
-rw-r--r--Documentation/git-notes.txt22
-rw-r--r--Documentation/git-p4.txt26
-rw-r--r--Documentation/git-push.txt8
-rw-r--r--Documentation/git-quiltimport.txt4
-rw-r--r--Documentation/git-rebase.txt10
-rw-r--r--Documentation/git-remote.txt10
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-replace.txt2
-rw-r--r--Documentation/git-revert.txt4
-rw-r--r--Documentation/git-send-email.txt80
-rw-r--r--Documentation/git-send-pack.txt10
-rw-r--r--Documentation/git-sh-setup.txt2
-rw-r--r--Documentation/git-shell.txt4
-rw-r--r--Documentation/git-show-branch.txt2
-rw-r--r--Documentation/git-show-ref.txt6
-rw-r--r--Documentation/git-svn.txt42
-rw-r--r--Documentation/git-tag.txt6
-rw-r--r--Documentation/git-update-index.txt14
-rw-r--r--Documentation/git-verify-commit.txt2
-rw-r--r--Documentation/git-web--browse.txt8
-rw-r--r--Documentation/git.txt142
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitdiffcore.txt4
-rw-r--r--Documentation/gitignore.txt2
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitmodules.txt2
-rw-r--r--Documentation/gitremote-helpers.txt16
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/gitweb.txt4
-rw-r--r--Documentation/howto/new-command.txt2
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/pretty-options.txt4
-rw-r--r--Documentation/rev-list-options.txt2
-rw-r--r--Documentation/revisions.txt26
-rw-r--r--Documentation/technical/signature-format.txt186
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
-rw-r--r--bisect.c1
-rw-r--r--builtin/add.c33
-rw-r--r--builtin/am.c16
-rw-r--r--builtin/blame.c23
-rw-r--r--builtin/checkout.c2
-rw-r--r--builtin/clone.c5
-rw-r--r--builtin/commit.c4
-rw-r--r--builtin/fetch.c6
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/grep.c4
-rw-r--r--builtin/reset.c2
-rw-r--r--builtin/rev-list.c6
-rw-r--r--cache.h10
-rw-r--r--color.h5
-rw-r--r--commit.c9
-rw-r--r--commit.h2
-rw-r--r--compat/mingw.c6
-rw-r--r--compat/mingw.h4
-rw-r--r--compat/regex/regcomp.c2
-rw-r--r--compat/regex/regex.c1
-rw-r--r--compat/winansi.c2
-rw-r--r--config.c2
-rw-r--r--contrib/completion/git-prompt.sh6
-rw-r--r--contrib/credential/gnome-keyring/Makefile5
-rw-r--r--daemon.c14
-rw-r--r--date.c2
-rw-r--r--diffcore-pickaxe.c33
-rw-r--r--gettext.c24
-rw-r--r--gettext.h1
-rwxr-xr-xgit-add--interactive.perl4
-rwxr-xr-xgit-p4.py2
-rw-r--r--git-rebase--am.sh4
-rw-r--r--git-rebase--interactive.sh5
-rw-r--r--git-rebase--merge.sh4
-rw-r--r--git-sh-setup.sh6
-rw-r--r--graph.c7
-rw-r--r--graph.h5
-rw-r--r--grep.c92
-rw-r--r--grep.h1
-rw-r--r--help.c6