summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--.mailmap3
-rw-r--r--.travis.yml9
-rw-r--r--Documentation/CodingGuidelines14
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/2.10.0.txt675
-rw-r--r--Documentation/RelNotes/2.10.1.txt131
-rw-r--r--Documentation/RelNotes/2.10.2.txt111
-rw-r--r--Documentation/RelNotes/2.10.3.txt48
-rw-r--r--Documentation/RelNotes/2.11.0.txt593
-rw-r--r--Documentation/RelNotes/2.12.0.txt53
-rw-r--r--Documentation/RelNotes/2.3.10.txt2
-rw-r--r--Documentation/RelNotes/2.4.10.txt2
-rw-r--r--Documentation/RelNotes/2.5.4.txt2
-rw-r--r--Documentation/RelNotes/2.6.1.txt2
-rw-r--r--Documentation/RelNotes/2.9.1.txt89
-rw-r--r--Documentation/RelNotes/2.9.2.txt13
-rw-r--r--Documentation/RelNotes/2.9.3.txt170
-rw-r--r--Documentation/RelNotes/2.9.4.txt83
-rw-r--r--Documentation/SubmittingPatches10
-rw-r--r--Documentation/blame-options.txt5
-rw-r--r--Documentation/config.txt314
-rw-r--r--Documentation/date-formats.txt2
-rw-r--r--Documentation/diff-config.txt26
-rw-r--r--Documentation/diff-format.txt8
-rw-r--r--Documentation/diff-generate-patch.txt8
-rw-r--r--Documentation/diff-heuristic-options.txt7
-rw-r--r--Documentation/diff-options.txt40
-rw-r--r--Documentation/fetch-options.txt22
-rw-r--r--Documentation/git-add.txt7
-rw-r--r--Documentation/git-am.txt7
-rw-r--r--Documentation/git-annotate.txt1
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-bisect.txt4
-rw-r--r--Documentation/git-blame.txt4
-rw-r--r--Documentation/git-branch.txt6
-rw-r--r--Documentation/git-cat-file.txt50
-rw-r--r--Documentation/git-check-ref-format.txt4
-rw-r--r--Documentation/git-checkout.txt16
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-clean.txt2
-rw-r--r--Documentation/git-clone.txt18
-rw-r--r--Documentation/git-commit-tree.txt2
-rw-r--r--Documentation/git-commit.txt16
-rw-r--r--Documentation/git-config.txt33
-rw-r--r--Documentation/git-count-objects.txt5
-rw-r--r--Documentation/git-credential-store.txt2
-rw-r--r--Documentation/git-cvsimport.txt14
-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.txt6
-rw-r--r--Documentation/git-fetch-pack.txt18
-rw-r--r--Documentation/git-fetch.txt51
-rw-r--r--Documentation/git-filter-branch.txt8
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-format-patch.txt14
-rw-r--r--Documentation/git-fsck.txt11
-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-index-pack.txt2
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-instaweb.txt4
-rw-r--r--Documentation/git-interpret-trailers.txt17
-rw-r--r--Documentation/git-log.txt8
-rw-r--r--Documentation/git-ls-files.txt12
-rw-r--r--Documentation/git-ls-tree.txt8
-rw-r--r--Documentation/git-mailsplit.txt7
-rw-r--r--Documentation/git-merge-base.txt26
-rw-r--r--Documentation/git-mergetool.txt7
-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-pack-objects.txt4
-rw-r--r--Documentation/git-push.txt21
-rw-r--r--Documentation/git-quiltimport.txt4
-rw-r--r--Documentation/git-rebase.txt10
-rw-r--r--Documentation/git-receive-pack.txt3
-rw-r--r--Documentation/git-remote-fd.txt2
-rw-r--r--Documentation/git-remote.txt10
-rw-r--r--Documentation/git-repack.txt23
-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-stash.txt3
-rw-r--r--Documentation/git-status.txt133
-rw-r--r--Documentation/git-submodule.txt15
-rw-r--r--Documentation/git-svn.txt53
-rw-r--r--Documentation/git-tag.txt11
-rw-r--r--Documentation/git-unpack-objects.txt3
-rw-r--r--Documentation/git-update-index.txt14
-rw-r--r--Documentation/git-upload-pack.txt16
-rw-r--r--Documentation/git-verify-commit.txt2
-rw-r--r--Documentation/git-web--browse.txt8
-rw-r--r--Documentation/git-worktree.txt49
-rw-r--r--Documentation/git.txt169
-rw-r--r--Documentation/gitattributes.txt231
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcvs-migration.txt6
-rw-r--r--Documentation/gitdiffcore.txt4
-rw-r--r--Documentation/githooks.txt18
-rw-r--r--Documentation/gitignore.txt2
-rw-r--r--Documentation/gitk.txt4
-rw-r--r--Documentation/gitmodules.txt14
-rw-r--r--Documentation/gitremote-helpers.txt27
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitrevisions.txt6
-rw-r--r--Documentation/gitweb.conf.txt23
-rw-r--r--Documentation/gitweb.txt4
-rw-r--r--Documentation/howto/new-command.txt2
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt16
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/pretty-formats.txt25