summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml91
-rw-r--r--Documentation/RelNotes/1.7.7.txt2
-rw-r--r--Documentation/RelNotes/1.8.3.1.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.1.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.2.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.3.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.4.txt2
-rw-r--r--Documentation/RelNotes/1.9.0.txt2
-rw-r--r--Documentation/RelNotes/2.5.0.txt563
-rw-r--r--Documentation/RelNotes/2.5.1.txt65
-rw-r--r--Documentation/RelNotes/2.5.2.txt63
-rw-r--r--Documentation/RelNotes/2.5.3.txt17
-rw-r--r--Documentation/RelNotes/2.5.4.txt18
-rw-r--r--Documentation/RelNotes/2.6.0.txt370
-rw-r--r--Documentation/RelNotes/2.6.1.txt18
-rw-r--r--Documentation/RelNotes/2.6.2.txt65
-rw-r--r--Documentation/RelNotes/2.6.3.txt111
-rw-r--r--Documentation/RelNotes/2.6.4.txt63
-rw-r--r--Documentation/RelNotes/2.6.5.txt58
-rw-r--r--Documentation/RelNotes/2.7.0.txt414
-rw-r--r--Documentation/blame-options.txt5
-rwxr-xr-xDocumentation/cmd-list.perl4
-rw-r--r--Documentation/config.txt261
-rw-r--r--Documentation/diff-options.txt13
-rw-r--r--Documentation/git-am.txt11
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-bisect.txt240
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt20
-rw-r--r--Documentation/git-cat-file.txt118
-rw-r--r--Documentation/git-check-attr.txt5
-rw-r--r--Documentation/git-check-ignore.txt15
-rw-r--r--Documentation/git-check-ref-format.txt6
-rw-r--r--Documentation/git-checkout.txt27
-rw-r--r--Documentation/git-cherry-pick.txt10
-rw-r--r--Documentation/git-clone.txt9
-rw-r--r--Documentation/git-commit-tree.txt6
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-config.txt10
-rw-r--r--Documentation/git-describe.txt4
-rw-r--r--Documentation/git-fast-import.txt39
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-fmt-merge-msg.txt14
-rw-r--r--Documentation/git-for-each-ref.txt44
-rw-r--r--Documentation/git-format-patch.txt6
-rw-r--r--Documentation/git-fsck.txt7
-rw-r--r--Documentation/git-gc.txt7
-rw-r--r--Documentation/git-get-tar-commit-id.txt12
-rw-r--r--Documentation/git-grep.txt9
-rw-r--r--Documentation/git-hash-object.txt5
-rw-r--r--Documentation/git-interpret-trailers.txt2
-rw-r--r--Documentation/git-log.txt6
-rw-r--r--Documentation/git-ls-remote.txt3
-rw-r--r--Documentation/git-merge-file.txt3
-rw-r--r--Documentation/git-merge.txt12
-rw-r--r--Documentation/git-mktag.txt5
-rw-r--r--Documentation/git-notes.txt29
-rw-r--r--Documentation/git-p4.txt60
-rw-r--r--Documentation/git-patch-id.txt4
-rw-r--r--Documentation/git-pull.txt3
-rw-r--r--Documentation/git-push.txt41
-rw-r--r--Documentation/git-quiltimport.txt11
-rw-r--r--Documentation/git-rebase.txt23
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-remote.txt12
-rw-r--r--Documentation/git-request-pull.txt3
-rw-r--r--Documentation/git-rev-list.txt2
-rw-r--r--Documentation/git-rev-parse.txt14
-rw-r--r--Documentation/git-revert.txt10
-rw-r--r--Documentation/git-send-email.txt55
-rw-r--r--Documentation/git-send-pack.txt16
-rw-r--r--Documentation/git-show-index.txt7
-rw-r--r--Documentation/git-show-ref.txt7
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt10
-rw-r--r--Documentation/git-stripspace.txt9
-rw-r--r--Documentation/git-submodule.txt5
-rw-r--r--Documentation/git-svn.txt3
-rw-r--r--Documentation/git-tag.txt49
-rw-r--r--Documentation/git-tools.txt124
-rw-r--r--Documentation/git-unpack-objects.txt2
-rw-r--r--Documentation/git-update-index.txt16
-rw-r--r--Documentation/git-update-ref.txt5
-rw-r--r--Documentation/git-upload-archive.txt2
-rw-r--r--Documentation/git-verify-commit.txt4
-rw-r--r--Documentation/git-verify-tag.txt4
-rw-r--r--Documentation/git-worktree.txt223
-rw-r--r--Documentation/git.txt60
-rw-r--r--Documentation/gitattributes.txt7
-rw-r--r--Documentation/giteveryday.txt2
-rw-r--r--Documentation/gitignore.txt23
-rw-r--r--Documentation/gitremote-helpers.txt3
-rw-r--r--Documentation/gitrepository-layout.txt74
-rw-r--r--Documentation/gitrevisions.txt2
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/glossary-content.txt22
-rw-r--r--Documentation/howto/new-command.txt4
-rw-r--r--Documentation/i18n.txt33
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/pretty-options.txt7
-rw-r--r--Documentation/rev-list-options.txt28
-rw-r--r--Documentation/revisions.txt25
-rw-r--r--Documentation/technical/api-argv-array.txt3
-rw-r--r--Documentation/technical/api-lockfile.txt220
-rw-r--r--Documentation/technical/api-parse-options.txt19
-rw-r--r--Documentation/technical/api-ref-iteration.txt2
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/technical/api-run-command.txt7
-rw-r--r--Documentation/technical/api-submodule-config.txt62
-rw-r--r--Documentation/technical/http-protocol.txt3
-rw-r--r--Documentation/technical/index-format.txt64
-rw-r--r--Documentation/technical/pack-protocol.txt46
-rw-r--r--Documentation/technical/protocol-capabilities.txt7
-rw-r--r--Documentation/technical/protocol-common.txt5
-rw-r--r--Documentation/technical/racy-git.txt8
-rw-r--r--Documentation/technical/repository-version.txt88
-rw-r--r--Documentation/urls-remotes.txt2
-rw-r--r--Documentation/user-manual.txt14
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile88
l---------RelNotes2
-rw-r--r--advice.c8
-rw-r--r--advice.h1
-rw-r--r--alias.c3
-rw-r--r--archive-tar.c30