summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--.editorconfig16
-rw-r--r--.gitattributes7
-rw-r--r--.gitignore12
-rw-r--r--.mailmap16
-rw-r--r--.travis.yml25
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/CodingGuidelines23
-rw-r--r--Documentation/Makefile28
-rw-r--r--Documentation/RelNotes/2.14.5.txt16
-rw-r--r--Documentation/RelNotes/2.15.3.txt6
-rw-r--r--Documentation/RelNotes/2.16.5.txt6
-rw-r--r--Documentation/RelNotes/2.17.2.txt12
-rw-r--r--Documentation/RelNotes/2.18.1.txt6
-rw-r--r--Documentation/RelNotes/2.19.0.txt394
-rw-r--r--Documentation/RelNotes/2.19.1.txt6
-rw-r--r--Documentation/RelNotes/2.19.2.txt108
-rw-r--r--Documentation/RelNotes/2.20.0.txt700
-rw-r--r--Documentation/RelNotes/2.20.1.txt20
-rw-r--r--Documentation/RelNotes/2.21.0.txt242
-rw-r--r--Documentation/SubmittingPatches4
-rw-r--r--Documentation/config.txt3441
-rw-r--r--Documentation/config/add.txt7
-rw-r--r--Documentation/config/advice.txt93
-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)22
-rw-r--r--Documentation/config/difftool.txt14
-rw-r--r--Documentation/config/fastimport.txt8
-rw-r--r--Documentation/config/fetch.txt65
-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.txt87
-rw-r--r--Documentation/config/fsck.txt67
-rw-r--r--Documentation/config/gc.txt108
-rw-r--r--Documentation/config/gitcvs.txt67
-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.txt57
-rw-r--r--Documentation/config/guitool.txt50
-rw-r--r--Documentation/config/help.txt23
-rw-r--r--Documentation/config/http.txt280
-rw-r--r--Documentation/config/i18n.txt10
-rw-r--r--Documentation/config/imap.txt44
-rw-r--r--Documentation/config/index.txt26
-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)10
-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.txt36
-rw-r--r--Documentation/config/push.txt113
-rw-r--r--Documentation/config/rebase.txt (renamed from Documentation/rebase-config.txt)19
-rw-r--r--Documentation/config/receive.txt123
-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.txt63
-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.txt82
-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/diff-format.txt16
-rw-r--r--Documentation/diff-options.txt52
-rwxr-xr-xDocumentation/doc-diff130
-rw-r--r--Documentation/fetch-options.txt34
-rw-r--r--Documentation/git-add.txt8
-rw-r--r--Documentation/git-archimport.txt5
-rw-r--r--Documentation/git-bisect-lk2009.txt30
-rw-r--r--Documentation/git-branch.txt22
-rw-r--r--Documentation/git-cat-file.txt18
-rw-r--r--Documentation/git-checkout.txt43
-rw-r--r--Documentation/git-cherry-pick.txt14
-rw-r--r--Documentation/git-clone.txt6
-rw-r--r--Documentation/git-column.txt35
-rw-r--r--Documentation/git-commit-graph.txt45
-rw-r--r--Documentation/git-config.txt55
-rw-r--r--Documentation/git-describe.txt4
-rw-r--r--Documentation/git-diff.txt22
-rw-r--r--Documentation/git-fast-export.txt23
-rw-r--r--Documentation/git-fast-import.txt23
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-fmt-merge-msg.txt2
-rw-r--r--Documentation/git-for-each-ref.txt23
-rw-r--r--Documentation/git-format-patch.txt48
-rw-r--r--Documentation/git-fsck.txt3
-rw-r--r--Documentation/git-gc.txt7
-rw-r--r--Documentation/git-grep.txt18
-rw-r--r--Documentation/git-help.txt16
-rw-r--r--Documentation/git-imap-send.txt45
-rw-r--r--Documentation/git-init.txt