summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml2
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/RelNotes/2.20.0.txt59
-rw-r--r--Documentation/config.txt2941
-rw-r--r--Documentation/config/add.txt7
-rw-r--r--Documentation/config/advice.txt86
-rw-r--r--Documentation/config/alias.txt18
-rw-r--r--Documentation/config/am.txt14
-rw-r--r--Documentation/config/apply.txt11
-rw-r--r--Documentation/config/blame.txt21
-rw-r--r--Documentation/config/branch.txt102
-rw-r--r--Documentation/config/browser.txt9
-rw-r--r--Documentation/config/checkout.txt23
-rw-r--r--Documentation/config/clean.txt3
-rw-r--r--Documentation/config/color.txt201
-rw-r--r--Documentation/config/column.txt55
-rw-r--r--Documentation/config/commit.txt29
-rw-r--r--Documentation/config/completion.txt7
-rw-r--r--Documentation/config/core.txt600
-rw-r--r--Documentation/config/credential.txt26
-rw-r--r--Documentation/config/diff.txt (renamed from Documentation/diff-config.txt)2
-rw-r--r--Documentation/config/difftool.txt14
-rw-r--r--Documentation/config/fastimport.txt8
-rw-r--r--Documentation/config/fetch.txt (renamed from Documentation/fetch-config.txt)0
-rw-r--r--Documentation/config/filter.txt9
-rw-r--r--Documentation/config/fmt-merge-msg.txt (renamed from Documentation/fmt-merge-msg-config.txt)0
-rw-r--r--Documentation/config/format.txt (renamed from Documentation/format-config.txt)0
-rw-r--r--Documentation/config/fsck.txt67
-rw-r--r--Documentation/config/gc.txt108
-rw-r--r--Documentation/config/gitcvs.txt (renamed from Documentation/gitcvs-config.txt)0
-rw-r--r--Documentation/config/gitweb.txt16
-rw-r--r--Documentation/config/gpg.txt20
-rw-r--r--Documentation/config/grep.txt24
-rw-r--r--Documentation/config/gui.txt (renamed from Documentation/gui-config.txt)0
-rw-r--r--Documentation/config/guitool.txt50
-rw-r--r--Documentation/config/help.txt23
-rw-r--r--Documentation/config/http.txt271
-rw-r--r--Documentation/config/i18n.txt10
-rw-r--r--Documentation/config/imap.txt44
-rw-r--r--Documentation/config/index.txt10
-rw-r--r--Documentation/config/init.txt3
-rw-r--r--Documentation/config/instaweb.txt20
-rw-r--r--Documentation/config/interactive.txt16
-rw-r--r--Documentation/config/log.txt43
-rw-r--r--Documentation/config/mailinfo.txt6
-rw-r--r--Documentation/config/mailmap.txt15
-rw-r--r--Documentation/config/man.txt12
-rw-r--r--Documentation/config/merge.txt (renamed from Documentation/merge-config.txt)4
-rw-r--r--Documentation/config/mergetool.txt53
-rw-r--r--Documentation/config/notes.txt59
-rw-r--r--Documentation/config/pack.txt120
-rw-r--r--Documentation/config/pager.txt8
-rw-r--r--Documentation/config/pretty.txt9
-rw-r--r--Documentation/config/protocol.txt64
-rw-r--r--Documentation/config/pull.txt (renamed from Documentation/pull-config.txt)0
-rw-r--r--Documentation/config/push.txt (renamed from Documentation/push-config.txt)0
-rw-r--r--Documentation/config/rebase.txt (renamed from Documentation/rebase-config.txt)0
-rw-r--r--Documentation/config/receive.txt (renamed from Documentation/receive-config.txt)0
-rw-r--r--Documentation/config/remote.txt78
-rw-r--r--Documentation/config/remotes.txt3
-rw-r--r--Documentation/config/repack.txt27
-rw-r--r--Documentation/config/rerere.txt12
-rw-r--r--Documentation/config/reset.txt2
-rw-r--r--Documentation/config/sendemail.txt (renamed from Documentation/sendemail-config.txt)0
-rw-r--r--Documentation/config/sequencer.txt5
-rw-r--r--Documentation/config/showbranch.txt3
-rw-r--r--Documentation/config/splitindex.txt24
-rw-r--r--Documentation/config/ssh.txt35
-rw-r--r--Documentation/config/stash.txt9
-rw-r--r--Documentation/config/status.txt72
-rw-r--r--Documentation/config/submodule.txt (renamed from Documentation/submodule-config.txt)0
-rw-r--r--Documentation/config/tag.txt16
-rw-r--r--Documentation/config/transfer.txt71
-rw-r--r--Documentation/config/uploadarchive.txt6
-rw-r--r--Documentation/config/uploadpack.txt65
-rw-r--r--Documentation/config/url.txt30
-rw-r--r--Documentation/config/user.txt26
-rw-r--r--Documentation/config/versionsort.txt33
-rw-r--r--Documentation/config/web.txt4
-rw-r--r--Documentation/config/worktree.txt9
-rw-r--r--Documentation/git-config.txt26
-rw-r--r--Documentation/git-fmt-merge-msg.txt2
-rw-r--r--Documentation/git-imap-send.txt45
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-rebase.txt2
-rw-r--r--Documentation/git-reflog.txt7
-rw-r--r--Documentation/git-reset.txt5
-rw-r--r--Documentation/git-send-email.txt7
-rw-r--r--Documentation/git-worktree.txt65
-rw-r--r--Documentation/gitignore.txt3
-rw-r--r--Documentation/gitrepository-layout.txt19
-rw-r--r--Documentation/pretty-formats.txt3
-rw-r--r--Documentation/rev-list-options.txt2
-rw-r--r--Makefile3
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--archive.c9
-rw-r--r--archive.h1
-rw-r--r--builtin/am.c60
-rw-r--r--builtin/archive.c2
-rw-r--r--builtin/cat-file.c16
-rw-r--r--builtin/commit.c2
-rw-r--r--builtin/config.c19
-rw-r--r--builtin/describe.c2
-rw-r--r--builtin/fetch.c146
-rw-r--r--builtin/fsck.c68
-rw-r--r--builtin/grep.c17
-rw-r--r--builtin/ls-remote.c13
-rw-r--r--builtin/merge-tree.c3
-rw-r--r--builtin/pack-objects.c1
-rw-r--r--builtin/prune.c3
-rw-r--r--builtin/pull.c2
-rw-r--r--builtin/reflog.c46
-rw-r--r--builtin/repack.c13
-rw-r--r--builtin/rerere.c3
-rw-r--r--builtin/reset.c15
-rw-r--r--builtin/rev-list.c1
-rw-r--r--builtin/rev-parse.c1
-rw-r--r--builtin/submodule--helper.c91
-rw-r--r--builtin/update-index.c2
-rw-r--r--builtin/upload-archive.c2
-rw-r--r--builtin/worktree.c10
-rw-r--r--cache.h15
-rw-r--r--combine-diff.c67
-rw-r--r--commit-reach.c69
-rw-r--r--commit-reach.h18
-rw-r--r--commit.h4
-rw-r--r--compat/min