summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--.gitignore6
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/Makefile157
-rw-r--r--Documentation/RelNotes-1.5.2.2.txt2
-rw-r--r--Documentation/RelNotes-1.6.0.2.txt2
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt4
-rw-r--r--Documentation/RelNotes-1.6.1.2.txt4
-rw-r--r--Documentation/RelNotes-1.6.2.1.txt19
-rw-r--r--Documentation/RelNotes-1.6.2.2.txt45
-rw-r--r--Documentation/RelNotes-1.6.2.3.txt22
-rw-r--r--Documentation/RelNotes-1.6.2.4.txt39
-rw-r--r--Documentation/RelNotes-1.6.2.5.txt21
-rw-r--r--Documentation/RelNotes-1.6.2.txt164
-rw-r--r--Documentation/RelNotes-1.6.3.1.txt10
-rw-r--r--Documentation/RelNotes-1.6.3.2.txt61
-rw-r--r--Documentation/RelNotes-1.6.3.3.txt38
-rw-r--r--Documentation/RelNotes-1.6.3.4.txt36
-rw-r--r--Documentation/RelNotes-1.6.3.txt182
-rw-r--r--Documentation/RelNotes-1.6.4.txt147
-rw-r--r--Documentation/RelNotes-1.6.5.txt51
-rw-r--r--Documentation/SubmittingPatches51
-rw-r--r--Documentation/asciidoc.conf16
-rw-r--r--Documentation/blame-options.txt16
-rw-r--r--Documentation/callouts.xsl30
-rwxr-xr-xDocumentation/cat-texi.perl8
-rw-r--r--Documentation/config.txt311
-rw-r--r--Documentation/diff-format.txt8
-rw-r--r--Documentation/diff-options.txt32
-rw-r--r--Documentation/docbook-xsl.css14
-rw-r--r--Documentation/git-add.txt21
-rw-r--r--Documentation/git-am.txt76
-rw-r--r--Documentation/git-annotate.txt6
-rw-r--r--Documentation/git-apply.txt32
-rw-r--r--Documentation/git-archive.txt32
-rw-r--r--Documentation/git-bisect.txt190
-rw-r--r--Documentation/git-blame.txt62
-rw-r--r--Documentation/git-branch.txt80
-rw-r--r--Documentation/git-bundle.txt164
-rw-r--r--Documentation/git-cat-file.txt22
-rw-r--r--Documentation/git-check-attr.txt16
-rw-r--r--Documentation/git-check-ref-format.txt64
-rw-r--r--Documentation/git-checkout.txt86
-rw-r--r--Documentation/git-cherry.txt3
-rw-r--r--Documentation/git-clean.txt13
-rw-r--r--Documentation/git-clone.txt2
-rw-r--r--Documentation/git-config.txt17
-rw-r--r--Documentation/git-cvsexportcommit.txt4
-rw-r--r--Documentation/git-cvsimport.txt38
-rw-r--r--Documentation/git-daemon.txt2
-rw-r--r--Documentation/git-describe.txt2
-rw-r--r--Documentation/git-diff-files.txt3
-rw-r--r--Documentation/git-diff-index.txt2
-rw-r--r--Documentation/git-diff-tree.txt3
-rw-r--r--Documentation/git-diff.txt3
-rw-r--r--Documentation/git-difftool.txt105
-rw-r--r--Documentation/git-fast-export.txt25
-rw-r--r--Documentation/git-filter-branch.txt67
-rw-r--r--Documentation/git-for-each-ref.txt7
-rw-r--r--Documentation/git-format-patch.txt72
-rw-r--r--Documentation/git-gc.txt10
-rw-r--r--Documentation/git-grep.txt21
-rw-r--r--Documentation/git-imap-send.txt23
-rw-r--r--Documentation/git-init-db.txt2
-rw-r--r--Documentation/git-init.txt21
-rw-r--r--Documentation/git-ls-files.txt4
-rw-r--r--Documentation/git-ls-tree.txt2
-rw-r--r--Documentation/git-merge-base.txt9
-rw-r--r--Documentation/git-merge.txt10
-rw-r--r--Documentation/git-mergetool--lib.txt54
-rw-r--r--Documentation/git-mergetool.txt18
-rw-r--r--Documentation/git-mktree.txt19
-rw-r--r--Documentation/git-pack-objects.txt7
-rw-r--r--Documentation/git-pack-refs.txt4
-rw-r--r--Documentation/git-parse-remote.txt20
-rw-r--r--Documentation/git-patch-id.txt2
-rw-r--r--Documentation/git-prune-packed.txt4
-rw-r--r--Documentation/git-push.txt73
-rw-r--r--Documentation/git-read-tree.txt5
-rw-r--r--Documentation/git-rebase.txt60
-rw-r--r--Documentation/git-remote.txt32
-rw-r--r--Documentation/git-repack.txt7
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-reset.txt29
-rw-r--r--Documentation/git-rev-list.txt23
-rw-r--r--Documentation/git-rev-parse.txt58
-rw-r--r--Documentation/git-send-email.txt156
-rw-r--r--Documentation/git-shell.txt6
-rw-r--r--Documentation/git-shortlog.txt49
-rw-r--r--Documentation/git-show-branch.txt39
-rw-r--r--Documentation/git-show-ref.txt15
-rw-r--r--Documentation/git-stash.txt58
-rw-r--r--Documentation/git-submodule.txt49
-rw-r--r--Documentation/git-svn.txt445
-rw-r--r--Documentation/git-tag.txt10
-rw-r--r--Documentation/git-update-server-info.txt6
-rw-r--r--Documentation/git-verify-pack.txt3
-rw-r--r--Documentation/git.txt38
-rw-r--r--Documentation/gitattributes.txt41
-rw-r--r--Documentation/gitcli.txt24
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/gitcvs-migration.txt2
-rw-r--r--Documentation/githooks.txt6
-rw-r--r--Documentation/gitk.txt5
-rw-r--r--Documentation/gitmodules.txt11
-rw-r--r--Documentation/gittutorial-2.txt4
-rw-r--r--Documentation/gittutorial.txt32
-rw-r--r--Documentation/glossary-content.txt8
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt2
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt4
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt2
-rw-r--r--Documentation/mailmap.txt74
-rw-r--r--Documentation/manpage-1.72.xsl27
-rw-r--r--Documentation/manpage-base.xsl35
-rw-r--r--Documentation/manpage-bold-literal.xsl17
-rw-r--r--Documentation/manpage-normal.xsl13
-rw-r--r--Documentation/manpage-suppress-sp.xsl21
-rw-r--r--Documentation/merge-config.txt3
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/merge-strategies.txt14
-rw-r--r--Documentation/pretty-formats.txt17
-rw-r--r--Documentation/pretty-options.txt7
-rw-r--r--Documentation/pt_BR/gittutorial.txt675
-rw-r--r--Documentation/rev-list-options.txt34
-rw-r--r--Documentation/technical/api-parse-options.txt49
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation