summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/1.7.6.txt136
-rw-r--r--Documentation/blame-options.txt5
-rw-r--r--Documentation/config.txt20
-rw-r--r--Documentation/diff-config.txt44
-rw-r--r--Documentation/diff-options.txt90
-rw-r--r--Documentation/git-annotate.txt1
-rw-r--r--Documentation/git-bisect.txt1
-rw-r--r--Documentation/git-blame.txt20
-rw-r--r--Documentation/git-check-ref-format.txt9
-rw-r--r--Documentation/git-cherry-pick.txt1
-rw-r--r--Documentation/git-cherry.txt1
-rw-r--r--Documentation/git-citool.txt1
-rw-r--r--Documentation/git-commit-tree.txt1
-rw-r--r--Documentation/git-commit.txt24
-rw-r--r--Documentation/git-config.txt22
-rw-r--r--Documentation/git-count-objects.txt1
-rw-r--r--Documentation/git-cvsexportcommit.txt1
-rw-r--r--Documentation/git-diff-files.txt1
-rw-r--r--Documentation/git-diff-index.txt1
-rw-r--r--Documentation/git-difftool.txt1
-rw-r--r--Documentation/git-fast-export.txt1
-rw-r--r--Documentation/git-fast-import.txt12
-rw-r--r--Documentation/git-fetch-pack.txt1
-rw-r--r--Documentation/git-fetch.txt4
-rw-r--r--Documentation/git-filter-branch.txt5
-rw-r--r--Documentation/git-fsck-objects.txt1
-rw-r--r--Documentation/git-gc.txt1
-rw-r--r--Documentation/git-get-tar-commit-id.txt1
-rw-r--r--Documentation/git-grep.txt8
-rw-r--r--Documentation/git-gui.txt1
-rw-r--r--Documentation/git-help.txt1
-rw-r--r--Documentation/git-http-fetch.txt1
-rw-r--r--Documentation/git-http-push.txt1
-rw-r--r--Documentation/git-imap-send.txt1
-rw-r--r--Documentation/git-init-db.txt1
-rw-r--r--Documentation/git-init.txt1
-rw-r--r--Documentation/git-log.txt5
-rw-r--r--Documentation/git-lost-found.txt1
-rw-r--r--Documentation/git-ls-remote.txt8
-rw-r--r--Documentation/git-mailinfo.txt1
-rw-r--r--Documentation/git-mailsplit.txt1
-rw-r--r--Documentation/git-merge-index.txt1
-rw-r--r--Documentation/git-merge-one-file.txt1
-rw-r--r--Documentation/git-merge-tree.txt1
-rw-r--r--Documentation/git-mergetool--lib.txt1
-rw-r--r--Documentation/git-mergetool.txt1
-rw-r--r--Documentation/git-mktag.txt1
-rw-r--r--Documentation/git-mktree.txt1
-rw-r--r--Documentation/git-mv.txt1
-rw-r--r--Documentation/git-notes.txt23
-rw-r--r--Documentation/git-pack-redundant.txt1
-rw-r--r--Documentation/git-pack-refs.txt1
-rw-r--r--Documentation/git-parse-remote.txt1
-rw-r--r--Documentation/git-patch-id.txt1
-rw-r--r--Documentation/git-peek-remote.txt1
-rw-r--r--Documentation/git-prune-packed.txt1
-rw-r--r--Documentation/git-prune.txt1
-rw-r--r--Documentation/git-pull.txt1
-rw-r--r--Documentation/git-read-tree.txt6
-rw-r--r--Documentation/git-rebase.txt20
-rw-r--r--Documentation/git-receive-pack.txt1
-rw-r--r--Documentation/git-reflog.txt1
-rw-r--r--Documentation/git-relink.txt1
-rw-r--r--Documentation/git-remote-ext.txt1
-rw-r--r--Documentation/git-remote-helpers.txt1
-rw-r--r--Documentation/git-remote.txt19
-rw-r--r--Documentation/git-repack.txt1
-rw-r--r--Documentation/git-repo-config.txt1
-rw-r--r--Documentation/git-request-pull.txt1
-rw-r--r--Documentation/git-rerere.txt1
-rw-r--r--Documentation/git-rev-list.txt1
-rw-r--r--Documentation/git-rev-parse.txt1
-rw-r--r--Documentation/git-revert.txt1
-rw-r--r--Documentation/git-rm.txt1
-rw-r--r--Documentation/git-send-email.txt1
-rw-r--r--Documentation/git-send-pack.txt1
-rw-r--r--Documentation/git-sh-i18n--envsubst.txt36
-rw-r--r--Documentation/git-sh-i18n.txt43
-rw-r--r--Documentation/git-sh-setup.txt12
-rw-r--r--Documentation/git-shell.txt1
-rw-r--r--Documentation/git-show-branch.txt1
-rw-r--r--Documentation/git-show-index.txt1
-rw-r--r--Documentation/git-show.txt1
-rw-r--r--Documentation/git-status.txt1
-rw-r--r--Documentation/git-stripspace.txt1
-rw-r--r--Documentation/git-submodule.txt10
-rw-r--r--Documentation/git-svn.txt11
-rw-r--r--Documentation/git-symbolic-ref.txt1
-rw-r--r--Documentation/git-tar-tree.txt1
-rw-r--r--Documentation/git-unpack-file.txt1
-rw-r--r--Documentation/git-unpack-objects.txt1
-rw-r--r--Documentation/git-update-ref.txt6
-rw-r--r--Documentation/git-update-server-info.txt1
-rw-r--r--Documentation/git-upload-archive.txt1
-rw-r--r--Documentation/git-upload-pack.txt1
-rw-r--r--Documentation/git-var.txt1
-rw-r--r--Documentation/git-verify-pack.txt1
-rw-r--r--Documentation/git-verify-tag.txt1
-rw-r--r--Documentation/git-web--browse.txt1
-rw-r--r--Documentation/git-whatchanged.txt1
-rw-r--r--Documentation/git-write-tree.txt1
-rw-r--r--Documentation/git.txt26
-rw-r--r--Documentation/gitattributes.txt56
-rw-r--r--Documentation/gitcvs-migration.txt3
-rw-r--r--Documentation/gitdiffcore.txt1
-rw-r--r--Documentation/gitk.txt1
-rw-r--r--Documentation/gittutorial-2.txt1
-rw-r--r--Documentation/gittutorial.txt1
-rw-r--r--Documentation/gitworkflows.txt1
-rw-r--r--Documentation/glossary-content.txt63
-rw-r--r--Documentation/merge-config.txt10
-rw-r--r--Documentation/pretty-options.txt40
-rw-r--r--Documentation/rev-list-options.txt11
-rw-r--r--Documentation/technical/api-builtin.txt2
-rw-r--r--Documentation/technical/index-format.txt5
-rw-r--r--Documentation/technical/pack-protocol.txt103
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile119
l---------RelNotes2
-rw-r--r--abspath.c3
-rw-r--r--archive-zip.c10
-rw-r--r--archive.c18
-rw-r--r--attr.c4
-rw-r--r--bisect.c70
-rw-r--r--