Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:28:10 +0000 (10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:28:10 +0000 (10:28 -0700)
* jk/git-connection-deadlock-fix:
  test core.gitproxy configuration
  send-pack: avoid deadlock on git:// push with failed pack-objects
  connect: let callers know if connection is a socket
  connect: treat generic proxy processes like ssh processes

Conflicts:
connect.c

1205 files changed:
.gitattributes
.gitignore
.mailmap
COPYING
Documentation/CodingGuidelines
Documentation/Makefile
Documentation/RelNotes/1.5.0.1.txt [moved from Documentation/RelNotes-1.5.0.1.txt with 100% similarity]
Documentation/RelNotes/1.5.0.2.txt [moved from Documentation/RelNotes-1.5.0.2.txt with 100% similarity]
Documentation/RelNotes/1.5.0.3.txt [moved from Documentation/RelNotes-1.5.0.3.txt with 100% similarity]
Documentation/RelNotes/1.5.0.4.txt [moved from Documentation/RelNotes-1.5.0.4.txt with 100% similarity]
Documentation/RelNotes/1.5.0.5.txt [moved from Documentation/RelNotes-1.5.0.5.txt with 100% similarity]
Documentation/RelNotes/1.5.0.6.txt [moved from Documentation/RelNotes-1.5.0.6.txt with 100% similarity]
Documentation/RelNotes/1.5.0.7.txt [moved from Documentation/RelNotes-1.5.0.7.txt with 100% similarity]
Documentation/RelNotes/1.5.0.txt [moved from Documentation/RelNotes-1.5.0.txt with 100% similarity]
Documentation/RelNotes/1.5.1.1.txt [moved from Documentation/RelNotes-1.5.1.1.txt with 100% similarity]
Documentation/RelNotes/1.5.1.2.txt [moved from Documentation/RelNotes-1.5.1.2.txt with 100% similarity]
Documentation/RelNotes/1.5.1.3.txt [moved from Documentation/RelNotes-1.5.1.3.txt with 100% similarity]
Documentation/RelNotes/1.5.1.4.txt [moved from Documentation/RelNotes-1.5.1.4.txt with 100% similarity]
Documentation/RelNotes/1.5.1.5.txt [moved from Documentation/RelNotes-1.5.1.5.txt with 100% similarity]
Documentation/RelNotes/1.5.1.6.txt [moved from Documentation/RelNotes-1.5.1.6.txt with 100% similarity]
Documentation/RelNotes/1.5.1.txt [moved from Documentation/RelNotes-1.5.1.txt with 100% similarity]
Documentation/RelNotes/1.5.2.1.txt [moved from Documentation/RelNotes-1.5.2.1.txt with 100% similarity]
Documentation/RelNotes/1.5.2.2.txt [moved from Documentation/RelNotes-1.5.2.2.txt with 100% similarity]
Documentation/RelNotes/1.5.2.3.txt [moved from Documentation/RelNotes-1.5.2.3.txt with 100% similarity]
Documentation/RelNotes/1.5.2.4.txt [moved from Documentation/RelNotes-1.5.2.4.txt with 100% similarity]
Documentation/RelNotes/1.5.2.5.txt [moved from Documentation/RelNotes-1.5.2.5.txt with 100% similarity]
Documentation/RelNotes/1.5.2.txt [moved from Documentation/RelNotes-1.5.2.txt with 100% similarity]
Documentation/RelNotes/1.5.3.1.txt [moved from Documentation/RelNotes-1.5.3.1.txt with 100% similarity]
Documentation/RelNotes/1.5.3.2.txt [moved from Documentation/RelNotes-1.5.3.2.txt with 100% similarity]
Documentation/RelNotes/1.5.3.3.txt [moved from Documentation/RelNotes-1.5.3.3.txt with 100% similarity]
Documentation/RelNotes/1.5.3.4.txt [moved from Documentation/RelNotes-1.5.3.4.txt with 100% similarity]
Documentation/RelNotes/1.5.3.5.txt [moved from Documentation/RelNotes-1.5.3.5.txt with 100% similarity]
Documentation/RelNotes/1.5.3.6.txt [moved from Documentation/RelNotes-1.5.3.6.txt with 100% similarity]
Documentation/RelNotes/1.5.3.7.txt [moved from Documentation/RelNotes-1.5.3.7.txt with 100% similarity]
Documentation/RelNotes/1.5.3.8.txt [moved from Documentation/RelNotes-1.5.3.8.txt with 100% similarity]
Documentation/RelNotes/1.5.3.txt [moved from Documentation/RelNotes-1.5.3.txt with 100% similarity]
Documentation/RelNotes/1.5.4.1.txt [moved from Documentation/RelNotes-1.5.4.1.txt with 100% similarity]
Documentation/RelNotes/1.5.4.2.txt [moved from Documentation/RelNotes-1.5.4.2.txt with 100% similarity]
Documentation/RelNotes/1.5.4.3.txt [moved from Documentation/RelNotes-1.5.4.3.txt with 100% similarity]
Documentation/RelNotes/1.5.4.4.txt [moved from Documentation/RelNotes-1.5.4.4.txt with 100% similarity]
Documentation/RelNotes/1.5.4.5.txt [moved from Documentation/RelNotes-1.5.4.5.txt with 100% similarity]
Documentation/RelNotes/1.5.4.6.txt [moved from Documentation/RelNotes-1.5.4.6.txt with 100% similarity]
Documentation/RelNotes/1.5.4.7.txt [moved from Documentation/RelNotes-1.5.4.7.txt with 100% similarity]
Documentation/RelNotes/1.5.4.txt [moved from Documentation/RelNotes-1.5.4.txt with 100% similarity]
Documentation/RelNotes/1.5.5.1.txt [moved from Documentation/RelNotes-1.5.5.1.txt with 100% similarity]
Documentation/RelNotes/1.5.5.2.txt [moved from Documentation/RelNotes-1.5.5.2.txt with 100% similarity]
Documentation/RelNotes/1.5.5.3.txt [moved from Documentation/RelNotes-1.5.5.3.txt with 100% similarity]
Documentation/RelNotes/1.5.5.4.txt [moved from Documentation/RelNotes-1.5.5.4.txt with 100% similarity]
Documentation/RelNotes/1.5.5.5.txt [moved from Documentation/RelNotes-1.5.5.5.txt with 100% similarity]
Documentation/RelNotes/1.5.5.6.txt [moved from Documentation/RelNotes-1.5.5.6.txt with 100% similarity]
Documentation/RelNotes/1.5.5.txt [moved from Documentation/RelNotes-1.5.5.txt with 100% similarity]
Documentation/RelNotes/1.5.6.1.txt [moved from Documentation/RelNotes-1.5.6.1.txt with 100% similarity]
Documentation/RelNotes/1.5.6.2.txt [moved from Documentation/RelNotes-1.5.6.2.txt with 100% similarity]
Documentation/RelNotes/1.5.6.3.txt [moved from Documentation/RelNotes-1.5.6.3.txt with 96% similarity]
Documentation/RelNotes/1.5.6.4.txt [moved from Documentation/RelNotes-1.5.6.4.txt with 100% similarity]
Documentation/RelNotes/1.5.6.5.txt [moved from Documentation/RelNotes-1.5.6.5.txt with 100% similarity]
Documentation/RelNotes/1.5.6.6.txt [moved from Documentation/RelNotes-1.5.6.6.txt with 100% similarity]
Documentation/RelNotes/1.5.6.txt [moved from Documentation/RelNotes-1.5.6.txt with 100% similarity]
Documentation/RelNotes/1.6.0.1.txt [moved from Documentation/RelNotes-1.6.0.1.txt with 100% similarity]
Documentation/RelNotes/1.6.0.2.txt [moved from Documentation/RelNotes-1.6.0.2.txt with 97% similarity]
Documentation/RelNotes/1.6.0.3.txt [moved from Documentation/RelNotes-1.6.0.3.txt with 100% similarity]
Documentation/RelNotes/1.6.0.4.txt [moved from Documentation/RelNotes-1.6.0.4.txt with 100% similarity]
Documentation/RelNotes/1.6.0.5.txt [moved from Documentation/RelNotes-1.6.0.5.txt with 100% similarity]
Documentation/RelNotes/1.6.0.6.txt [moved from Documentation/RelNotes-1.6.0.6.txt with 100% similarity]
Documentation/RelNotes/1.6.0.txt [moved from Documentation/RelNotes-1.6.0.txt with 100% similarity]
Documentation/RelNotes/1.6.1.1.txt [moved from Documentation/RelNotes-1.6.1.1.txt with 100% similarity]
Documentation/RelNotes/1.6.1.2.txt [moved from Documentation/RelNotes-1.6.1.2.txt with 100% similarity]
Documentation/RelNotes/1.6.1.3.txt [moved from Documentation/RelNotes-1.6.1.3.txt with 100% similarity]
Documentation/RelNotes/1.6.1.4.txt [moved from Documentation/RelNotes-1.6.1.4.txt with 100% similarity]
Documentation/RelNotes/1.6.1.txt [moved from Documentation/RelNotes-1.6.1.txt with 100% similarity]
Documentation/RelNotes/1.6.2.1.txt [moved from Documentation/RelNotes-1.6.2.1.txt with 100% similarity]
Documentation/RelNotes/1.6.2.2.txt [moved from Documentation/RelNotes-1.6.2.2.txt with 100% similarity]
Documentation/RelNotes/1.6.2.3.txt [moved from Documentation/RelNotes-1.6.2.3.txt with 100% similarity]
Documentation/RelNotes/1.6.2.4.txt [moved from Documentation/RelNotes-1.6.2.4.txt with 100% similarity]
Documentation/RelNotes/1.6.2.5.txt [moved from Documentation/RelNotes-1.6.2.5.txt with 100% similarity]
Documentation/RelNotes/1.6.2.txt [moved from Documentation/RelNotes-1.6.2.txt with 100% similarity]
Documentation/RelNotes/1.6.3.1.txt [moved from Documentation/RelNotes-1.6.3.1.txt with 100% similarity]
Documentation/RelNotes/1.6.3.2.txt [moved from Documentation/RelNotes-1.6.3.2.txt with 100% similarity]
Documentation/RelNotes/1.6.3.3.txt [moved from Documentation/RelNotes-1.6.3.3.txt with 100% similarity]
Documentation/RelNotes/1.6.3.4.txt [moved from Documentation/RelNotes-1.6.3.4.txt with 100% similarity]
Documentation/RelNotes/1.6.3.txt [moved from Documentation/RelNotes-1.6.3.txt with 100% similarity]
Documentation/RelNotes/1.6.4.1.txt [moved from Documentation/RelNotes-1.6.4.1.txt with 100% similarity]
Documentation/RelNotes/1.6.4.2.txt [moved from Documentation/RelNotes-1.6.4.2.txt with 100% similarity]
Documentation/RelNotes/1.6.4.3.txt [moved from Documentation/RelNotes-1.6.4.3.txt with 94% similarity]
Documentation/RelNotes/1.6.4.4.txt [moved from Documentation/RelNotes-1.6.4.4.txt with 100% similarity]
Documentation/RelNotes/1.6.4.5.txt [new file with mode: 0644]
Documentation/RelNotes/1.6.4.txt [moved from Documentation/RelNotes-1.6.4.txt with 100% similarity]
Documentation/RelNotes/1.6.5.1.txt [moved from Documentation/RelNotes-1.6.5.1.txt with 100% similarity]
Documentation/RelNotes/1.6.5.2.txt [moved from Documentation/RelNotes-1.6.5.2.txt with 100% similarity]
Documentation/RelNotes/1.6.5.3.txt [moved from Documentation/RelNotes-1.6.5.3.txt with 100% similarity]
Documentation/RelNotes/1.6.5.4.txt [moved from Documentation/RelNotes-1.6.5.4.txt with 99% similarity]
Documentation/RelNotes/1.6.5.5.txt [moved from Documentation/RelNotes-1.6.5.5.txt with 100% similarity]
Documentation/RelNotes/1.6.5.6.txt [moved from Documentation/RelNotes-1.6.5.6.txt with 100% similarity]
Documentation/RelNotes/1.6.5.7.txt [moved from Documentation/RelNotes-1.6.5.7.txt with 98% similarity]
Documentation/RelNotes/1.6.5.8.txt [moved from Documentation/RelNotes-1.6.5.8.txt with 100% similarity]
Documentation/RelNotes/1.6.5.9.txt [new file with mode: 0644]
Documentation/RelNotes/1.6.5.txt [moved from Documentation/RelNotes-1.6.5.txt with 100% similarity]
Documentation/RelNotes/1.6.6.1.txt [moved from Documentation/RelNotes-1.6.6.1.txt with 100% similarity]
Documentation/RelNotes/1.6.6.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.6.6.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.6.6.txt [moved from Documentation/RelNotes-1.6.6.txt with 98% similarity]
Documentation/RelNotes/1.7.0.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.4.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.5.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.6.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.7.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.8.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.9.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.4.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.4.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.5.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.4.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.5.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.4.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.5.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.txt [new file with mode: 0644]
Documentation/SubmittingPatches
Documentation/asciidoc.conf
Documentation/blame-options.txt
Documentation/config.txt
Documentation/date-formats.txt [new file with mode: 0644]
Documentation/diff-format.txt
Documentation/diff-generate-patch.txt
Documentation/diff-options.txt
Documentation/docbook.xsl
Documentation/everyday.txt
Documentation/fetch-options.txt
Documentation/git-add.txt
Documentation/git-am.txt
Documentation/git-apply.txt
Documentation/git-archimport.txt
Documentation/git-archive.txt
Documentation/git-bisect-lk2009.txt
Documentation/git-bisect.txt
Documentation/git-blame.txt
Documentation/git-branch.txt
Documentation/git-bundle.txt
Documentation/git-cat-file.txt
Documentation/git-check-ref-format.txt
Documentation/git-checkout-index.txt
Documentation/git-checkout.txt
Documentation/git-cherry-pick.txt
Documentation/git-cherry.txt
Documentation/git-citool.txt
Documentation/git-clean.txt
Documentation/git-clone.txt
Documentation/git-commit-tree.txt
Documentation/git-commit.txt
Documentation/git-config.txt
Documentation/git-cvsexportcommit.txt
Documentation/git-cvsimport.txt
Documentation/git-cvsserver.txt
Documentation/git-daemon.txt
Documentation/git-describe.txt
Documentation/git-diff-files.txt
Documentation/git-diff-index.txt
Documentation/git-diff-tree.txt
Documentation/git-diff.txt
Documentation/git-difftool.txt
Documentation/git-fast-export.txt
Documentation/git-fast-import.txt
Documentation/git-fetch-pack.txt
Documentation/git-fetch.txt
Documentation/git-filter-branch.txt
Documentation/git-fmt-merge-msg.txt
Documentation/git-for-each-ref.txt
Documentation/git-format-patch.txt
Documentation/git-fsck.txt
Documentation/git-gc.txt
Documentation/git-get-tar-commit-id.txt
Documentation/git-grep.txt
Documentation/git-gui.txt
Documentation/git-hash-object.txt
Documentation/git-help.txt
Documentation/git-http-backend.txt
Documentation/git-http-fetch.txt
Documentation/git-imap-send.txt
Documentation/git-index-pack.txt
Documentation/git-init.txt
Documentation/git-instaweb.txt
Documentation/git-log.txt
Documentation/git-ls-files.txt
Documentation/git-ls-remote.txt
Documentation/git-ls-tree.txt
Documentation/git-mailinfo.txt
Documentation/git-mailsplit.txt
Documentation/git-merge-base.txt
Documentation/git-merge-file.txt
Documentation/git-merge-index.txt
Documentation/git-merge-one-file.txt
Documentation/git-merge.txt
Documentation/git-mergetool--lib.txt
Documentation/git-mergetool.txt
Documentation/git-name-rev.txt
Documentation/git-notes.txt
Documentation/git-pack-objects.txt
Documentation/git-pack-redundant.txt
Documentation/git-patch-id.txt
Documentation/git-peek-remote.txt
Documentation/git-prune.txt
Documentation/git-pull.txt
Documentation/git-push.txt
Documentation/git-read-tree.txt
Documentation/git-rebase.txt
Documentation/git-receive-pack.txt
Documentation/git-reflog.txt
Documentation/git-relink.txt
Documentation/git-remote-ext.txt [new file with mode: 0644]
Documentation/git-remote-fd.txt [new file with mode: 0644]
Documentation/git-remote-helpers.txt
Documentation/git-remote.txt
Documentation/git-repack.txt
Documentation/git-replace.txt
Documentation/git-request-pull.txt
Documentation/git-rerere.txt
Documentation/git-reset.txt
Documentation/git-rev-list.txt
Documentation/git-rev-parse.txt
Documentation/git-revert.txt
Documentation/git-rm.txt
Documentation/git-send-email.txt
Documentation/git-send-pack.txt
Documentation/git-sh-setup.txt
Documentation/git-shell.txt
Documentation/git-shortlog.txt
Documentation/git-show-branch.txt
Documentation/git-show-index.txt
Documentation/git-show-ref.txt
Documentation/git-show.txt
Documentation/git-stash.txt
Documentation/git-status.txt
Documentation/git-submodule.txt
Documentation/git-svn.txt
Documentation/git-symbolic-ref.txt
Documentation/git-tag.txt
Documentation/git-tar-tree.txt
Documentation/git-update-index.txt
Documentation/git-upload-archive.txt
Documentation/git-upload-pack.txt
Documentation/git-var.txt
Documentation/git-verify-pack.txt
Documentation/git-verify-tag.txt
Documentation/git-web--browse.txt
Documentation/git-whatchanged.txt
Documentation/git-write-tree.txt
Documentation/git.txt
Documentation/gitattributes.txt
Documentation/gitcore-tutorial.txt
Documentation/gitcvs-migration.txt
Documentation/gitdiffcore.txt
Documentation/githooks.txt
Documentation/gitignore.txt
Documentation/gitk.txt
Documentation/gitmodules.txt
Documentation/gitrepository-layout.txt
Documentation/gitrevisions.txt [new file with mode: 0644]
Documentation/gittutorial-2.txt
Documentation/gittutorial.txt
Documentation/gitworkflows.txt
Documentation/glossary-content.txt
Documentation/howto/revert-a-faulty-merge.txt
Documentation/howto/revert-branch-rebase.txt
Documentation/howto/using-merge-subtree.txt
Documentation/i18n.txt
Documentation/install-webdoc.sh
Documentation/merge-config.txt
Documentation/merge-options.txt
Documentation/merge-strategies.txt
Documentation/pretty-formats.txt
Documentation/pretty-options.txt
Documentation/pull-fetch-param.txt
Documentation/rev-list-options.txt
Documentation/revisions.txt [new file with mode: 0644]
Documentation/technical/api-directory-listing.txt
Documentation/technical/api-merge.txt [new file with mode: 0644]
Documentation/technical/api-parse-options.txt
Documentation/technical/api-run-command.txt
Documentation/technical/api-sigchain.txt [new file with mode: 0644]
Documentation/technical/api-strbuf.txt
Documentation/technical/api-string-list.txt
Documentation/technical/api-tree-walking.txt
Documentation/technical/index-format.txt [new file with mode: 0644]
Documentation/technical/pack-protocol.txt
Documentation/technical/protocol-capabilities.txt
Documentation/urls-remotes.txt
Documentation/urls.txt
Documentation/user-manual.txt
GIT-VERSION-GEN
INSTALL
Makefile
RelNotes
abspath.c
aclocal.m4 [new file with mode: 0644]
advice.c
advice.h
alias.c
archive.c
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
block-sha1/sha1.c
branch.c
branch.h
builtin-commit-tree.c [deleted file]
builtin-revert.c [deleted file]
builtin.h
builtin/add.c [moved from builtin-add.c with 70% similarity]
builtin/annotate.c [moved from builtin-annotate.c with 100% similarity]
builtin/apply.c [moved from builtin-apply.c with 86% similarity]
builtin/archive.c [moved from builtin-archive.c with 71% similarity]
builtin/bisect--helper.c [moved from builtin-bisect--helper.c with 100% similarity]
builtin/blame.c [moved from builtin-blame.c with 93% similarity]
builtin/branch.c [moved from builtin-branch.c with 81% similarity]
builtin/bundle.c [moved from builtin-bundle.c with 89% similarity]
builtin/cat-file.c [moved from builtin-cat-file.c with 82% similarity]
builtin/check-attr.c [moved from builtin-check-attr.c with 98% similarity]
builtin/check-ref-format.c [moved from builtin-check-ref-format.c with 60% similarity]
builtin/checkout-index.c [moved from builtin-checkout-index.c with 96% similarity]
builtin/checkout.c [moved from builtin-checkout.c with 78% similarity]
builtin/clean.c [moved from builtin-clean.c with 77% similarity]
builtin/clone.c [moved from builtin-clone.c with 93% similarity]
builtin/commit-tree.c [new file with mode: 0644]
builtin/commit.c [moved from builtin-commit.c with 68% similarity]
builtin/config.c [moved from builtin-config.c with 87% similarity]
builtin/count-objects.c [moved from builtin-count-objects.c with 98% similarity]
builtin/describe.c [moved from builtin-describe.c with 77% similarity]
builtin/diff-files.c [moved from builtin-diff-files.c with 97% similarity]
builtin/diff-index.c [moved from builtin-diff-index.c with 96% similarity]
builtin/diff-tree.c [moved from builtin-diff-tree.c with 89% similarity]
builtin/diff.c [moved from builtin-diff.c with 93% similarity]
builtin/fast-export.c [moved from builtin-fast-export.c with 90% similarity]
builtin/fetch-pack.c [moved from builtin-fetch-pack.c with 99% similarity]
builtin/fetch.c [moved from builtin-fetch.c with 80% similarity]
builtin/fmt-merge-msg.c [moved from builtin-fmt-merge-msg.c with 58% similarity]
builtin/for-each-ref.c [moved from builtin-for-each-ref.c with 92% similarity]
builtin/fsck.c [moved from builtin-fsck.c with 95% similarity]
builtin/gc.c [moved from builtin-gc.c with 97% similarity]
builtin/grep.c [moved from builtin-grep.c with 52% similarity]
builtin/hash-object.c [moved from hash-object.c with 93% similarity]
builtin/help.c [moved from builtin-help.c with 94% similarity]
builtin/index-pack.c [moved from index-pack.c with 92% similarity]
builtin/init-db.c [moved from builtin-init-db.c with 89% similarity]
builtin/log.c [moved from builtin-log.c with 83% similarity]
builtin/ls-files.c [moved from builtin-ls-files.c with 80% similarity]
builtin/ls-remote.c [moved from builtin-ls-remote.c with 84% similarity]
builtin/ls-tree.c [moved from builtin-ls-tree.c with 95% similarity]
builtin/mailinfo.c [moved from builtin-mailinfo.c with 98% similarity]
builtin/mailsplit.c [moved from builtin-mailsplit.c with 97% similarity]
builtin/merge-base.c [moved from builtin-merge-base.c with 53% similarity]
builtin/merge-file.c [moved from builtin-merge-file.c with 66% similarity]
builtin/merge-index.c [moved from merge-index.c with 94% similarity]
builtin/merge-ours.c [moved from builtin-merge-ours.c with 100% similarity]
builtin/merge-recursive.c [moved from builtin-merge-recursive.c with 78% similarity]
builtin/merge-tree.c [moved from merge-tree.c with 96% similarity]
builtin/merge.c [moved from builtin-merge.c with 84% similarity]
builtin/mktag.c [moved from mktag.c with 98% similarity]
builtin/mktree.c [moved from builtin-mktree.c with 100% similarity]
builtin/mv.c [moved from builtin-mv.c with 92% similarity]
builtin/name-rev.c [moved from builtin-name-rev.c with 99% similarity]
builtin/notes.c [new file with mode: 0644]
builtin/pack-objects.c [moved from builtin-pack-objects.c with 95% similarity]
builtin/pack-redundant.c [moved from pack-redundant.c with 99% similarity]
builtin/pack-refs.c [moved from builtin-pack-refs.c with 100% similarity]
builtin/patch-id.c [new file with mode: 0644]
builtin/prune-packed.c [moved from builtin-prune-packed.c with 100% similarity]
builtin/prune.c [moved from builtin-prune.c with 87% similarity]
builtin/push.c [moved from builtin-push.c with 60% similarity]
builtin/read-tree.c [moved from builtin-read-tree.c with 76% similarity]
builtin/receive-pack.c [moved from builtin-receive-pack.c with 66% similarity]
builtin/reflog.c [moved from builtin-reflog.c with 85% similarity]
builtin/remote-ext.c [new file with mode: 0644]
builtin/remote-fd.c [new file with mode: 0644]
builtin/remote.c [moved from builtin-remote.c with 80% similarity]
builtin/replace.c [moved from builtin-replace.c with 100% similarity]
builtin/rerere.c [moved from builtin-rerere.c with 65% similarity]
builtin/reset.c [moved from builtin-reset.c with 76% similarity]
builtin/rev-list.c [moved from builtin-rev-list.c with 90% similarity]
builtin/rev-parse.c [moved from builtin-rev-parse.c with 93% similarity]
builtin/revert.c [new file with mode: 0644]
builtin/rm.c [moved from builtin-rm.c with 94% similarity]
builtin/send-pack.c [moved from builtin-send-pack.c with 66% similarity]
builtin/shortlog.c [moved from builtin-shortlog.c with 91% similarity]
builtin/show-branch.c [moved from builtin-show-branch.c with 98% similarity]
builtin/show-ref.c [moved from builtin-show-ref.c with 97% similarity]
builtin/stripspace.c [moved from builtin-stripspace.c with 100% similarity]
builtin/symbolic-ref.c [moved from builtin-symbolic-ref.c with 93% similarity]
builtin/tag.c [moved from builtin-tag.c with 94% similarity]
builtin/tar-tree.c [moved from builtin-tar-tree.c with 100% similarity]
builtin/unpack-file.c [moved from unpack-file.c with 89% similarity]
builtin/unpack-objects.c [moved from builtin-unpack-objects.c with 99% similarity]
builtin/update-index.c [moved from builtin-update-index.c with 62% similarity]
builtin/update-ref.c [moved from builtin-update-ref.c with 100% similarity]
builtin/update-server-info.c [moved from builtin-update-server-info.c with 86% similarity]
builtin/upload-archive.c [moved from builtin-upload-archive.c with 100% similarity]
builtin/var.c [moved from var.c with 85% similarity]
builtin/verify-pack.c [moved from builtin-verify-pack.c with 100% similarity]
builtin/verify-tag.c [moved from builtin-verify-tag.c with 89% similarity]
builtin/write-tree.c [moved from builtin-write-tree.c with 100% similarity]
bundle.c
cache-tree.c
cache.h
color.c
color.h
combine-diff.c
commit.c
commit.h
compat/bswap.h
compat/inet_ntop.c
compat/inet_pton.c
compat/mingw.c
compat/mingw.h
compat/mkdtemp.c
compat/mkstemps.c [deleted file]
compat/msvc.c
compat/msvc.h
compat/nedmalloc/malloc.c.h
compat/regex/regcomp.c [new file with mode: 0644]
compat/regex/regex.c
compat/regex/regex.h
compat/regex/regex_internal.c [new file with mode: 0644]
compat/regex/regex_internal.h [new file with mode: 0644]
compat/regex/regexec.c [new file with mode: 0644]
compat/strtok_r.c [new file with mode: 0644]
compat/vcbuild/include/dirent.h [deleted file]
compat/vcbuild/include/termios.h [new file with mode: 0644]
compat/vcbuild/include/unistd.h
compat/vcbuild/scripts/clink.pl
compat/win32/dirent.c [new file with mode: 0644]
compat/win32/dirent.h [new file with mode: 0644]
compat/win32/pthread.c [new file with mode: 0644]
compat/win32/pthread.h [new file with mode: 0644]
compat/win32/sys/poll.c [new file with mode: 0644]
compat/win32/sys/poll.h [new file with mode: 0644]
compat/win32/syslog.c [new file with mode: 0644]
compat/win32/syslog.h [new file with mode: 0644]
compat/win32mmap.c
config.c
config.mak.in
configure.ac
connect.c
contrib/buildsystems/engine.pl
contrib/ciabot/README [new file with mode: 0644]
contrib/ciabot/ciabot.py [new file with mode: 0755]
contrib/ciabot/ciabot.sh [new file with mode: 0755]
contrib/completion/git-completion.bash
contrib/emacs/git-blame.el
contrib/examples/builtin-fetch--tool.c
contrib/examples/git-commit.sh
contrib/examples/git-fetch.sh
contrib/examples/git-merge.sh
contrib/examples/git-notes.sh [moved from git-notes.sh with 100% similarity]
contrib/examples/git-revert.sh
contrib/examples/git-svnimport.perl
contrib/fast-import/git-p4
contrib/fast-import/import-directories.perl
contrib/fast-import/import-zips.py
contrib/git-resurrect.sh
contrib/git-shell-commands/README [new file with mode: 0644]
contrib/git-shell-commands/help [new file with mode: 0755]
contrib/git-shell-commands/list [new file with mode: 0755]
contrib/hg-to-git/hg-to-git.py
contrib/hooks/post-receive-email
contrib/p4import/git-p4import.py
contrib/svn-fe/.gitignore [new file with mode: 0644]
contrib/svn-fe/Makefile [new file with mode: 0644]
contrib/svn-fe/svn-fe.c [new file with mode: 0644]
contrib/svn-fe/svn-fe.txt [new file with mode: 0644]
contrib/thunderbird-patch-inline/appp.sh
contrib/workdir/git-new-workdir
convert.c
ctype.c
daemon.c
date.c
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
fast-import.c
fetch-pack.h
fsck.c
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-gui/GIT-VERSION-GEN
git-gui/Makefile
git-gui/git-gui--askpass
git-gui/git-gui.sh
git-gui/lib/about.tcl
git-gui/lib/blame.tcl
git-gui/lib/branch_checkout.tcl
git-gui/lib/branch_create.tcl
git-gui/lib/branch_delete.tcl
git-gui/lib/branch_rename.tcl
git-gui/lib/browser.tcl
git-gui/lib/choose_font.tcl
git-gui/lib/choose_repository.tcl
git-gui/lib/choose_rev.tcl
git-gui/lib/class.tcl
git-gui/lib/console.tcl
git-gui/lib/database.tcl
git-gui/lib/diff.tcl
git-gui/lib/error.tcl
git-gui/lib/index.tcl
git-gui/lib/merge.tcl
git-gui/lib/option.tcl
git-gui/lib/remote_add.tcl
git-gui/lib/remote_branch_delete.tcl
git-gui/lib/search.tcl
git-gui/lib/shortcut.tcl
git-gui/lib/sshkey.tcl
git-gui/lib/status_bar.tcl
git-gui/lib/themed.tcl [new file with mode: 0644]
git-gui/lib/tools_dlg.tcl
git-gui/lib/transport.tcl
git-gui/lib/win32.tcl
git-gui/po/de.po
git-gui/po/fr.po
git-gui/po/git-gui.pot
git-gui/po/it.po
git-gui/po/ja.po
git-gui/po/sv.po
git-gui/windows/git-gui.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh [changed mode: 0755->0644]
git-pull.sh
git-rebase--interactive.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.py [new file with mode: 0644]
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh [changed mode: 0755->0644]
git-stash.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c
git.spec.in
git_remote_helpers/.gitignore [new file with mode: 0644]
git_remote_helpers/Makefile [new file with mode: 0644]
git_remote_helpers/__init__.py [new file with mode: 0644]
git_remote_helpers/git/__init__.py [new file with mode: 0644]
git_remote_helpers/git/exporter.py [new file with mode: 0644]
git_remote_helpers/git/git.py [new file with mode: 0644]
git_remote_helpers/git/importer.py [new file with mode: 0644]
git_remote_helpers/git/non_local.py [new file with mode: 0644]
git_remote_helpers/git/repo.py [new file with mode: 0644]
git_remote_helpers/setup.cfg [new file with mode: 0644]
git_remote_helpers/setup.py [new file with mode: 0644]
git_remote_helpers/util.py [new file with mode: 0644]
gitk-git/gitk [changed mode: 0644->0755]
gitk-git/po/de.po
gitk-git/po/es.po
gitk-git/po/fr.po [new file with mode: 0644]
gitk-git/po/hu.po [new file with mode: 0644]
gitk-git/po/it.po
gitk-git/po/ja.po
gitk-git/po/pt_br.po [new file with mode: 0644]
gitk-git/po/ru.po
gitk-git/po/sv.po
gitweb/INSTALL
gitweb/Makefile [new file with mode: 0644]
gitweb/README
gitweb/gitweb.perl
gitweb/static/git-favicon.png [moved from gitweb/git-favicon.png with 100% similarity]
gitweb/static/git-logo.png [moved from gitweb/git-logo.png with 100% similarity]
gitweb/static/gitweb.css [moved from gitweb/gitweb.css with 93% similarity]
gitweb/static/gitweb.js [moved from gitweb/gitweb.js with 97% similarity]
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c [new file with mode: 0644]
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
levenshtein.h
list-objects.c
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-file.c
merge-recursive.c
merge-recursive.h
name-hash.c
notes-cache.c [new file with mode: 0644]
notes-cache.h [new file with mode: 0644]
notes-merge.c [new file with mode: 0644]
notes-merge.h [new file with mode: 0644]
notes.c
notes.h
object.c
object.h
pack-check.c
pack-refs.c
pack-write.c
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-id.c [deleted file]
path.c
perl/Git.pm
perl/Makefile
preload-index.c
pretty.c
quote.c
quote.h
reachable.c
read-cache.c
reflog-walk.c
refs.c
refs.h
remote-curl.c
remote.c
remote.h
rerere.c
rerere.h
resolve-undo.c [new file with mode: 0644]
resolve-undo.h [new file with mode: 0644]
revision.c
revision.h
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c
sha1_file.c
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
strbuf.c
strbuf.h
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
t/.gitignore
t/Makefile
t/README
t/aggregate-results.sh
t/annotate-tests.sh
t/diff-lib.sh
t/gitweb-lib.sh
t/harness [new file with mode: 0755]
t/lib-cvs.sh
t/lib-git-svn.sh
t/lib-httpd.sh
t/lib-httpd/apache.conf
t/lib-httpd/passwd [new file with mode: 0644]
t/lib-pager.sh [new file with mode: 0644]
t/lib-patch-mode.sh [changed mode: 0755->0644]
t/lib-prereq-FILEMODE.sh [new file with mode: 0644]
t/lib-rebase.sh
t/lib-t6000.sh [moved from t/t6000lib.sh with 97% similarity, mode: 0644]
t/lib-terminal.sh [new file with mode: 0644]
t/t0000-basic.sh
t/t0001-init.sh
t/t0003-attributes.sh
t/t0004-unwritable.sh
t/t0005-signals.sh
t/t0006-date.sh
t/t0020-crlf.sh
t/t0021-conversion.sh
t/t0022-crlf-rename.sh
t/t0024-crlf-archive.sh
t/t0025-crlf-auto.sh [new file with mode: 0755]
t/t0026-eol-config.sh [new file with mode: 0755]
t/t0040-parse-options.sh
t/t0050-filesystem.sh
t/t0061-run-command.sh [new file with mode: 0755]
t/t0070-fundamental.sh
t/t0080-vcs-svn.sh [new file with mode: 0755]
t/t0101-at-syntax.sh [new file with mode: 0755]
t/t1000-read-tree-m-3way.sh
t/t1001-read-tree-m-2way.sh
t/t1002-read-tree-m-u-2way.sh
t/t1004-read-tree-m-u-wf.sh
t/t1007-hash-object.sh
t/t1010-mktree.sh
t/t1011-read-tree-sparse-checkout.sh [new file with mode: 0755]
t/t1012-read-tree-df.sh [new file with mode: 0755]
t/t1020-subdirectory.sh
t/t1200-tutorial.sh
t/t1300-repo-config.sh
t/t1302-repo-version.sh
t/t1304-default-acl.sh [new file with mode: 0755]
t/t1400-update-ref.sh
t/t1401-symbolic-ref.sh
t/t1402-check-ref-format.sh
t/t1410-reflog.sh
t/t1411-reflog-show.sh
t/t1412-reflog-loop.sh [new file with mode: 0755]
t/t1450-fsck.sh
t/t1501-worktree.sh
t/t1502-rev-parse-parseopt.sh
t/t1503-rev-parse-verify.sh
t/t1504-ceiling-dirs.sh
t/t1506-rev-parse-diagnosis.sh [new file with mode: 0755]
t/t1507-rev-parse-upstream.sh [new file with mode: 0755]
t/t1508-at-combinations.sh [new file with mode: 0755]
t/t1509-root-worktree.sh [new file with mode: 0755]
t/t1509/excludes [new file with mode: 0644]
t/t1509/prepare-chroot.sh [new file with mode: 0755]
t/t1510-repo-setup.sh [new file with mode: 0755]
t/t1511-rev-parse-caret.sh [new file with mode: 0755]
t/t2006-checkout-index-basic.sh [new file with mode: 0755]
t/t2007-checkout-symlink.sh
t/t2012-checkout-last.sh
t/t2013-checkout-submodule.sh
t/t2016-checkout-patch.sh
t/t2017-checkout-orphan.sh [new file with mode: 0755]
t/t2018-checkout-branch.sh [new file with mode: 0755]
t/t2019-checkout-ambiguous-ref.sh [new file with mode: 0755]
t/t2021-checkout-overwrite.sh [new file with mode: 0755]
t/t2030-unresolve-info.sh [new file with mode: 0755]
t/t2050-git-dir-relative.sh
t/t2101-update-index-reupdate.sh
t/t2102-update-index-symlinks.sh
t/t2104-update-index-skip-worktree.sh [new file with mode: 0755]
t/t2105-update-index-gitfile.sh [new file with mode: 0755]
t/t2106-update-index-assume-unchanged.sh [new file with mode: 0755]
t/t2107-update-index-basic.sh [new file with mode: 0755]
t/t2200-add-update.sh
t/t2204-add-ignored.sh [new file with mode: 0755]
t/t3000-ls-files-others.sh
t/t3001-ls-files-others-exclude.sh
t/t3004-ls-files-basic.sh [new file with mode: 0755]
t/t3020-ls-files-error-unmatch.sh
t/t3030-merge-recursive.sh
t/t3032-merge-recursive-options.sh [new file with mode: 0755]
t/t3050-subprojects-fetch.sh
t/t3060-ls-files-with-tree.sh
t/t3100-ls-tree-restrict.sh
t/t3101-ls-tree-dirname.sh
t/t3200-branch.sh
t/t3203-branch-output.sh
t/t3210-pack-refs.sh
t/t3300-funny-names.sh
t/t3301-notes.sh
t/t3302-notes-index-expensive.sh
t/t3303-notes-subtrees.sh
t/t3304-notes-mixed.sh
t/t3305-notes-fanout.sh [new file with mode: 0755]
t/t3306-notes-prune.sh [new file with mode: 0755]
t/t3307-notes-man.sh [new file with mode: 0755]
t/t3308-notes-merge.sh [new file with mode: 0755]
t/t3309-notes-merge-auto-resolve.sh [new file with mode: 0755]
t/t3310-notes-merge-manual-resolve.sh [new file with mode: 0755]
t/t3311-notes-merge-fanout.sh [new file with mode: 0755]
t/t3400-rebase.sh
t/t3402-rebase-merge.sh
t/t3404-rebase-interactive.sh
t/t3406-rebase-message.sh
t/t3407-rebase-abort.sh
t/t3408-rebase-multi-line.sh
t/t3409-rebase-preserve-merges.sh
t/t3410-rebase-preserve-dropped-merges.sh
t/t3412-rebase-root.sh
t/t3415-rebase-autosquash.sh [new file with mode: 0755]
t/t3416-rebase-onto-threedots.sh [new file with mode: 0755]
t/t3417-rebase-whitespace-fix.sh [new file with mode: 0755]
t/t3418-rebase-continue.sh [new file with mode: 0755]
t/t3419-rebase-patch-id.sh [new file with mode: 0755]
t/t3500-cherry.sh
t/t3501-revert-cherry-pick.sh
t/t3504-cherry-pick-rerere.sh
t/t3505-cherry-pick-empty.sh
t/t3506-cherry-pick-ff.sh [new file with mode: 0755]
t/t3507-cherry-pick-conflict.sh [new file with mode: 0755]
t/t3508-cherry-pick-many-commits.sh [new file with mode: 0755]
t/t3509-cherry-pick-merge-df.sh [new file with mode: 0755]
t/t3600-rm.sh
t/t3700-add.sh
t/t3701-add-interactive.sh
t/t3800-mktag.sh
t/t3900-i18n-commit.sh
t/t3902-quoted.sh
t/t3903-stash.sh
t/t3904-stash-patch.sh
t/t4002-diff-basic.sh
t/t4003-diff-rename-1.sh
t/t4004-diff-rename-symlink.sh
t/t4005-diff-rename-2.sh
t/t4006-diff-mode.sh
t/t4008-diff-break-rewrite.sh
t/t4009-diff-rename-4.sh
t/t4011-diff-symlink.sh
t/t4012-diff-binary.sh
t/t4013-diff-various.sh
t/t4013/diff.diff_--cached [new file with mode: 0644]
t/t4013/diff.diff_--cached_--_file0 [new file with mode: 0644]
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
t/t4013/diff.log_-GF_-p_--pickaxe-all_master [new file with mode: 0644]
t/t4013/diff.log_-GF_-p_master [new file with mode: 0644]
t/t4013/diff.log_-GF_master [new file with mode: 0644]
t/t4013/diff.log_-SF_master_--max-count=0 [new file with mode: 0644]
t/t4013/diff.log_-SF_master_--max-count=1 [new file with mode: 0644]
t/t4013/diff.log_-SF_master_--max-count=2 [new file with mode: 0644]
t/t4013/diff.log_-S_F_master [new file with mode: 0644]
t/t4013/diff.log_-m_-p_--first-parent_master [new file with mode: 0644]
t/t4013/diff.log_-m_-p_master [new file with mode: 0644]
t/t4013/diff.log_-p_--first-parent_master [new file with mode: 0644]
t/t4013/diff.show_--first-parent_master [new file with mode: 0644]
t/t4013/diff.show_-c_master [new file with mode: 0644]
t/t4013/diff.show_-m_master [new file with mode: 0644]
t/t4014-format-patch.sh
t/t4015-diff-whitespace.sh
t/t4016-diff-quote.sh
t/t4017-diff-retval.sh
t/t4018-diff-funcname.sh
t/t4019-diff-wserror.sh
t/t4021-format-patch-numbered.sh
t/t4023-diff-rename-typechange.sh
t/t4026-color.sh
t/t4027-diff-submodule.sh
t/t4030-diff-textconv.sh
t/t4031-diff-rewrite-binary.sh
t/t4034-diff-words.sh
t/t4038-diff-combined.sh
t/t4040-whitespace-status.sh [new file with mode: 0755]
t/t4041-diff-submodule-option.sh [new file with mode: 0755]
t/t4041-diff-submodule.sh [deleted file]
t/t4042-diff-textconv-caching.sh [new file with mode: 0755]
t/t4043-diff-rename-binary.sh [new file with mode: 0755]
t/t4044-diff-index-unique-abbrev.sh [new file with mode: 0755]
t/t4045-diff-relative.sh [new file with mode: 0755]
t/t4102-apply-rename.sh
t/t4103-apply-binary.sh
t/t4104-apply-boundary.sh
t/t4111-apply-subdir.sh [new file with mode: 0755]
t/t4114-apply-typechange.sh
t/t4115-apply-symlink.sh
t/t4119-apply-config.sh
t/t4120-apply-popt.sh
t/t4122-apply-symlink-inside.sh
t/t4124-apply-ws-rule.sh
t/t4125-apply-ws-fuzz.sh
t/t4127-apply-same-fn.sh
t/t4129-apply-samemode.sh
t/t4130-apply-criss-cross-rename.sh
t/t4132-apply-removal.sh
t/t4133-apply-filenames.sh [new file with mode: 0755]
t/t4134-apply-submodule.sh [new file with mode: 0755]
t/t4135-apply-weird-filenames.sh [new file with mode: 0755]
t/t4135/.gitignore [new file with mode: 0644]
t/t4135/add-plain.diff [new file with mode: 0644]
t/t4135/add-with backslash.diff [new file with mode: 0644]
t/t4135/add-with quote.diff [new file with mode: 0644]
t/t4135/add-with spaces.diff [new file with mode: 0644]
t/t4135/add-with tab.diff [new file with mode: 0644]
t/t4135/damaged-tz.diff [new file with mode: 0644]
t/t4135/damaged.diff [new file with mode: 0644]
t/t4135/diff-plain.diff [new file with mode: 0644]
t/t4135/diff-with backslash.diff [new file with mode: 0644]
t/t4135/diff-with quote.diff [new file with mode: 0644]
t/t4135/diff-with spaces.diff [new file with mode: 0644]
t/t4135/diff-with tab.diff [new file with mode: 0644]
t/t4135/funny-tz.diff [new file with mode: 0644]
t/t4135/git-plain.diff [new file with mode: 0644]
t/t4135/git-with backslash.diff [new file with mode: 0644]
t/t4135/git-with quote.diff [new file with mode: 0644]
t/t4135/git-with spaces.diff [new file with mode: 0644]
t/t4135/git-with tab.diff [new file with mode: 0644]
t/t4135/make-patches [new file with mode: 0755]
t/t4150-am.sh
t/t4151-am-abort.sh
t/t4200-rerere.sh
t/t4201-shortlog.sh
t/t4202-log.sh
t/t4203-mailmap.sh
t/t4204-patch-id.sh
t/t4205-log-pretty-formats.sh [new file with mode: 0755]
t/t4206-log-follow-harder-copies.sh [new file with mode: 0755]
t/t4207-log-decoration-colors.sh [new file with mode: 0755]
t/t4252-am-options.sh
t/t4253-am-keep-cr-dos.sh [new file with mode: 0755]
t/t4300-merge-tree.sh [new file with mode: 0755]
t/t5000-tar-tree.sh
t/t5001-archive-attr.sh
t/t5100/msg0015
t/t5150-request-pull.sh [new file with mode: 0755]
t/t5300-pack-object.sh
t/t5301-sliding-window.sh
t/t5302-pack-index.sh
t/t5304-prune.sh
t/t5400-send-pack.sh
t/t5401-update-hooks.sh
t/t5405-send-pack-rewind.sh
t/t5407-post-rewrite-hook.sh [new file with mode: 0755]
t/t5500-fetch-pack.sh
t/t5502-quickfetch.sh
t/t5503-tagfollow.sh
t/t5505-remote.sh
t/t5510-fetch.sh
t/t5512-ls-remote.sh
t/t5513-fetch-track.sh
t/t5514-fetch-multiple.sh
t/t5516-fetch-push.sh
t/t5517-push-mirror.sh
t/t5519-push-alternates.sh
t/t5520-pull.sh
t/t5521-pull-options.sh
t/t5522-pull-symlink.sh
t/t5523-push-upstream.sh [new file with mode: 0755]
t/t5524-pull-msg.sh [new file with mode: 0755]
t/t5525-fetch-tagopt.sh [new file with mode: 0755]
t/t5526-fetch-submodules.sh [new file with mode: 0755]
t/t5530-upload-pack-error.sh
t/t5531-deep-submodule-push.sh
t/t5540-http-push.sh
t/t5541-http-push.sh
t/t5550-http-fetch.sh
t/t5551-http-fetch.sh
t/t5560-http-backend-noserver.sh [new file with mode: 0755]
t/t5560-http-backend.sh [deleted file]
t/t5561-http-backend.sh [new file with mode: 0755]
t/t556x_common [new file with mode: 0755]
t/t5601-clone.sh
t/t5602-clone-remote-exec.sh
t/t5700-clone-reference.sh
t/t5701-clone-local.sh
t/t5702-clone-options.sh
t/t5704-bundle.sh
t/t5705-clone-2gb.sh
t/t5800-remote-helpers.sh [new file with mode: 0755]
t/t6001-rev-list-graft.sh
t/t6002-rev-list-bisect.sh
t/t6003-rev-list-topo-order.sh
t/t6006-rev-list-format.sh
t/t6007-rev-list-cherry-pick-file.sh
t/t6009-rev-list-parent.sh
t/t6010-merge-base.sh
t/t6012-rev-list-simplify.sh
t/t6016-rev-list-graph-simplify-history.sh
t/t6018-rev-list-glob.sh [new file with mode: 0755]
t/t6019-rev-list-ancestry-path.sh [new file with mode: 0755]
t/t6020-merge-df.sh
t/t6022-merge-rename.sh
t/t6023-merge-file.sh
t/t6024-recursive-merge.sh
t/t6026-merge-attr.sh
t/t6029-merge-subtree.sh
t/t6030-bisect-porcelain.sh
t/t6031-merge-recursive.sh
t/t6032-merge-large-rename.sh
t/t6033-merge-crlf.sh
t/t6035-merge-dir-to-symlink.sh
t/t6036-recursive-corner-cases.sh
t/t6037-merge-ours-theirs.sh [new file with mode: 0755]
t/t6038-merge-text-auto.sh [new file with mode: 0755]
t/t6040-tracking-info.sh
t/t6050-replace.sh
t/t6101-rev-parse-parents.sh
t/t6110-rev-list-sparse.sh [new file with mode: 0755]
t/t6120-describe.sh
t/t6200-fmt-merge-msg.sh
t/t6300-for-each-ref.sh
t/t6500-gc.sh [new file with mode: 0755]
t/t7001-mv.sh
t/t7003-filter-branch.sh
t/t7004-tag.sh
t/t7005-editor.sh
t/t7006-pager.sh [new file with mode: 0755]
t/t7008-grep-binary.sh [new file with mode: 0755]
t/t7010-setup.sh
t/t7011-skip-worktree-reading.sh [new file with mode: 0755]
t/t7012-skip-worktree-writing.sh [new file with mode: 0755]
t/t7060-wtstatus.sh
t/t7103-reset-bare.sh
t/t7105-reset-patch.sh
t/t7110-reset-merge.sh [new file with mode: 0755]
t/t7111-reset-table.sh [new file with mode: 0755]
t/t7201-co.sh
t/t7300-clean.sh
t/t7400-submodule-basic.sh
t/t7401-submodule-summary.sh
t/t7403-submodule-sync.sh
t/t7405-submodule-merge.sh
t/t7406-submodule-update.sh
t/t7407-submodule-foreach.sh
t/t7500-commit.sh
t/t7500/edit-content [new file with mode: 0755]
t/t7501-commit.sh
t/t7502-commit.sh
t/t7505-prepare-commit-msg-hook.sh
t/t7506-status-submodule.sh
t/t7508-status.sh
t/t7509-commit.sh
t/t7600-merge.sh
t/t7601-merge-pull-config.sh
t/t7602-merge-octopus-many.sh
t/t7604-merge-custom-message.sh
t/t7606-merge-custom.sh
t/t7607-merge-overwrite.sh
t/t7608-merge-messages.sh
t/t7609-merge-co-error-msgs.sh [new file with mode: 0755]
t/t7610-mergetool.sh
t/t7611-merge-abort.sh [new file with mode: 0755]
t/t7700-repack.sh
t/t7701-repack-unpack-unreachable.sh
t/t7800-difftool.sh
t/t7810-grep.sh [moved from t/t7002-grep.sh with 67% similarity]
t/t7811-grep-open.sh [new file with mode: 0755]
t/t8001-annotate.sh
t/t8002-blame.sh
t/t8003-blame-corner-cases.sh [moved from t/t8003-blame.sh with 80% similarity]
t/t8004-blame-with-conflicts.sh [moved from t/t8004-blame.sh with 100% similarity]
t/t8006-blame-textconv.sh [new file with mode: 0755]
t/t8007-cat-file-textconv.sh [new file with mode: 0755]
t/t9001-send-email.sh
t/t9010-svn-fe.sh [new file with mode: 0755]
t/t9100-git-svn-basic.sh
t/t9101-git-svn-props.sh
t/t9102-git-svn-deep-rmdir.sh
t/t9104-git-svn-follow-parent.sh
t/t9105-git-svn-commit-diff.sh
t/t9106-git-svn-commit-diff-clobber.sh
t/t9107-git-svn-migrate.sh
t/t9114-git-svn-dcommit-merge.sh
t/t9115-git-svn-dcommit-funky-renames.sh
t/t9116-git-svn-log.sh
t/t9118-git-svn-funky-branch-names.sh
t/t9119-git-svn-info.sh
t/t9120-git-svn-clone-with-percent-escapes.sh
t/t9123-git-svn-rebuild-with-rewriteroot.sh
t/t9124-git-svn-dcommit-auto-props.sh
t/t9125-git-svn-multi-glob-branch-names.sh
t/t9127-git-svn-partial-rebuild.sh
t/t9128-git-svn-cmd-branch.sh
t/t9129-git-svn-i18n-commitencoding.sh
t/t9130-git-svn-authors-file.sh
t/t9131-git-svn-empty-symlink.sh
t/t9137-git-svn-dcommit-clobber-series.sh
t/t9139-git-svn-non-utf8-commitencoding.sh
t/t9140-git-svn-reset.sh
t/t9142-git-svn-shallow-clone.sh
t/t9143-git-svn-gc.sh
t/t9146-git-svn-empty-dirs.sh
t/t9150-svk-mergetickets.sh
t/t9151-svn-mergeinfo.sh
t/t9151/make-svnmerge-dump
t/t9151/svn-mergeinfo.dump
t/t9153-git-svn-rewrite-uuid.sh [new file with mode: 0755]
t/t9153/svn.dump [new file with mode: 0644]
t/t9154-git-svn-fancy-glob.sh [new file with mode: 0755]
t/t9154/svn.dump [new file with mode: 0644]
t/t9155-git-svn-fetch-deleted-tag.sh [new file with mode: 0755]
t/t9156-git-svn-fetch-deleted-tag-2.sh [new file with mode: 0755]
t/t9157-git-svn-fetch-merge.sh [new file with mode: 0755]
t/t9158-git-svn-mergeinfo.sh [new file with mode: 0755]
t/t9200-git-cvsexportcommit.sh
t/t9300-fast-import.sh
t/t9301-fast-import-notes.sh [new file with mode: 0755]
t/t9350-fast-export.sh [moved from t/t9301-fast-export.sh with 82% similarity]
t/t9400-git-cvsserver-server.sh
t/t9401-git-cvsserver-crlf.sh
t/t9500-gitweb-standalone-no-errors.sh
t/t9501-gitweb-standalone-http-status.sh
t/t9600-cvsimport.sh
t/t9601-cvsimport-vendor-branch.sh
t/t9602-cvsimport-branches-tags.sh
t/t9603-cvsimport-patchsets.sh
t/t9700-perl-git.sh
t/t9700/test.pl
t/test-lib.sh
t/test-terminal.perl [new file with mode: 0755]
t/valgrind/default.supp
tag.c
tag.h
templates/Makefile
templates/hooks--commit-msg.sample
templates/hooks--post-update.sample
templates/hooks--pre-commit.sample
templates/hooks--pre-rebase.sample
templates/hooks--prepare-commit-msg.sample
templates/hooks--update.sample
templates/info--exclude
test-chmtime.c
test-date.c
test-index-version.c [new file with mode: 0644]
test-line-buffer.c [new file with mode: 0644]
test-mktemp.c [new file with mode: 0644]
test-obj-pool.c [new file with mode: 0644]
test-parse-options.c
test-run-command.c [new file with mode: 0644]
test-string-pool.c [new file with mode: 0644]
test-subprocess.c [new file with mode: 0644]
test-svn-fe.c [new file with mode: 0644]
test-treap.c [new file with mode: 0644]
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
unpack-trees.c
unpack-trees.h
upload-pack.c
url.c [new file with mode: 0644]
url.h [new file with mode: 0644]
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
vcs-svn/LICENSE [new file with mode: 0644]
vcs-svn/fast_export.c [new file with mode: 0644]
vcs-svn/fast_export.h [new file with mode: 0644]
vcs-svn/line_buffer.c [new file with mode: 0644]
vcs-svn/line_buffer.h [new file with mode: 0644]
vcs-svn/line_buffer.txt [new file with mode: 0644]
vcs-svn/obj_pool.h [new file with mode: 0644]
vcs-svn/repo_tree.c [new file with mode: 0644]
vcs-svn/repo_tree.h [new file with mode: 0644]
vcs-svn/string_pool.c [new file with mode: 0644]
vcs-svn/string_pool.h [new file with mode: 0644]
vcs-svn/string_pool.txt [new file with mode: 0644]
vcs-svn/svndump.c [new file with mode: 0644]
vcs-svn/svndump.h [new file with mode: 0644]
vcs-svn/trp.h [new file with mode: 0644]
vcs-svn/trp.txt [new file with mode: 0644]
walker.c
walker.h
wrap-for-bin.sh [new file with mode: 0644]
wrapper.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
xdiff/xdiff.h
xdiff/xemit.c
xdiff/xmacros.h
xdiff/xmerge.c
xdiff/xutils.c
zlib.c [new file with mode: 0644]

index 0636dee..5e98806 100644 (file)
@@ -1,2 +1,3 @@
 * whitespace=!indent,trail,space
 *.[ch] whitespace=indent,trail,space
+*.sh whitespace=indent,trail,space
index ac02a58..3dd6ef7 100644 (file)
@@ -2,6 +2,7 @@
 /GIT-CFLAGS
 /GIT-GUI-VARS
 /GIT-VERSION-FILE
+/bin-wrappers/
 /git
 /git-add
 /git-add--interactive
 /git-relink
 /git-remote
 /git-remote-curl
+/git-remote-http
+/git-remote-https
+/git-remote-ftp
+/git-remote-ftps
+/git-remote-fd
+/git-remote-ext
+/git-remote-testgit
 /git-repack
 /git-replace
 /git-repo-config
 /git-write-tree
 /git-core-*/?*
 /gitk-git/gitk-wish
+/gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
+/gitweb/static/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date
 /test-delta
 /test-dump-cache-tree
 /test-genrandom
+/test-index-version
+/test-line-buffer
 /test-match-trees
+/test-obj-pool
 /test-parse-options
 /test-path-utils
+/test-run-command
 /test-sha1
 /test-sigchain
+/test-string-pool
+/test-subprocess
+/test-svn-fe
+/test-treap
 /common-cmds.h
 *.tar.gz
 *.dsc
 *.exe
 *.[aos]
 *.py[co]
+.depend/
+*.gcda
+*.gcno
+*.gcov
+/coverage-untested-functions
+/cover_db/
+/cover_db_html/
 *+
 /config.mak
 /autom4te.cache
index 975e675..19c8726 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -5,6 +5,7 @@
 # same person appearing not to be so.
 #
 
+Alex Bennée <kernel-hacker@bennee.com>
 Alexander Gavrilov <angavrilov@gmail.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
@@ -15,6 +16,7 @@ Daniel Barkalow <barkalow@iabervon.org>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
 David S. Miller <davem@davemloft.net>
+Deskin Miller <deskinm@umich.edu>
 Dirk Süsserott <newsletter@dirk.my1.cc>
 Fredrik Kuivinen <freku045@student.liu.se>
 H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
@@ -34,8 +36,9 @@ Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <lars.doelle@on-line.de>
 Li Hong <leehong@pku.edu.cn>
 Lukas Sandström <lukass@etek.chalmers.se>
-Martin Langhoff <martin@catalyst.net.nz>
+Martin Langhoff <martin@laptop.org>
 Michael Coleman <tutufan@gmail.com>
+Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
 Michael W. Olson <mwolson@gnu.org>
 Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
@@ -59,6 +62,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <uzeisberger@io.fsforth.de>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
+Vitaly "_Vi" Shukela <public_vi@tut.by>
 William Pursell <bill.pursell@gmail.com>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>
diff --git a/COPYING b/COPYING
index 6ff87c4..536e555 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -22,8 +22,8 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -36,7 +36,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -76,7 +76,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-\f
+
                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -131,7 +131,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-\f
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -189,7 +189,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-\f
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -246,7 +246,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-\f
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -299,7 +299,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                     END OF TERMS AND CONDITIONS
-\f
+
            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -324,10 +324,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -357,5 +356,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
index b8bf618..fe1c1e5 100644 (file)
@@ -31,25 +31,36 @@ But if you must have a list of rules, here they are.
 
 For shell scripts specifically (not exhaustive):
 
+ - We use tabs for indentation.
+
+ - Case arms are indented at the same depth as case and esac lines.
+
  - We prefer $( ... ) for command substitution; unlike ``, it
    properly nests.  It should have been the way Bourne spelled
    it from day one, but unfortunately isn't.
 
- - We use ${parameter-word} and its [-=?+] siblings, and their
-   colon'ed "unset or null" form.
+ - We use POSIX compliant parameter substitutions and avoid bashisms;
+   namely:
 
- We use ${parameter#word} and its [#%] siblings, and their
-   doubled "longest matching" form.
  - We use ${parameter-word} and its [-=?+] siblings, and their
+     colon'ed "unset or null" form.
 
- - We use Arithmetic Expansion $(( ... )).
+   - We use ${parameter#word} and its [#%] siblings, and their
+     doubled "longest matching" form.
 
- - No "Substring Expansion" ${parameter:offset:length}.
  - No "Substring Expansion" ${parameter:offset:length}.
 
- - No shell arrays.
  - No shell arrays.
 
- - No strlen ${#parameter}.
  - No strlen ${#parameter}.
 
- - No regexp ${parameter/pattern/string}.
+   - No pattern replacement ${parameter/pattern/string}.
+
+ - We use Arithmetic Expansion $(( ... )).
+
+ - Inside Arithmetic Expansion, spell shell variables with $ in front
+   of them, as some shells do not grok $((x)) while accepting $(($x))
+   just fine (e.g. dash older than 0.5.4).
 
  - We do not use Process Substitution <(list) or >(list).
 
@@ -132,3 +143,55 @@ For C programs:
 
  - When we pass <string, length> pair to functions, we should try to
    pass them in that order.
+
+Writing Documentation:
+
+ Every user-visible change should be reflected in the documentation.
+ The same general rule as for code applies -- imitate the existing
+ conventions.  A few commented examples follow to provide reference
+ when writing or modifying command usage strings and synopsis sections
+ in the manual pages:
+
+ Placeholders are spelled in lowercase and enclosed in angle brackets:
+   <file>
+   --sort=<key>
+   --abbrev[=<n>]
+
+ Possibility of multiple occurrences is indicated by three dots:
+   <file>...
+   (One or more of <file>.)
+
+ Optional parts are enclosed in square brackets:
+   [<extra>]
+   (Zero or one <extra>.)
+
+   --exec-path[=<path>]
+   (Option with an optional argument.  Note that the "=" is inside the
+   brackets.)
+
+   [<patch>...]
+   (Zero or more of <patch>.  Note that the dots are inside, not
+   outside the brackets.)
+
+ Multiple alternatives are indicated with vertical bar:
+   [-q | --quiet]
+   [--utf8 | --no-utf8]
+
+ Parentheses are used for grouping:
+   [(<rev>|<range>)...]
+   (Any number of either <rev> or <range>.  Parens are needed to make
+   it clear that "..." pertains to both <rev> and <range>.)
+
+   [(-p <parent>)...]
+   (Any number of option -p, each with one <parent> argument.)
+
+   git remote set-head <name> (-a | -d | <branch>)
+   (One and only one of "-a", "-d" or "<branch>" _must_ (no square
+   brackets) be provided.)
+
+ And a somewhat more contrived example:
+   --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]
+   Here "=" is outside the brackets, because "--diff-filter=" is a
+   valid usage.  "*" has its own pair of brackets, because it can
+   (optionally) be specified only when one or more of the letters is
+   also provided.
index 4797b2d..36989b7 100644 (file)
@@ -6,7 +6,7 @@ MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \
        gitrepository-layout.txt
 MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \
        gitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \
-       gitdiffcore.txt gitworkflows.txt
+       gitdiffcore.txt gitrevisions.txt gitworkflows.txt
 
 MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
 MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
@@ -63,35 +63,28 @@ endif
 
 #
 # For asciidoc ...
-#      -7.1.2, no extra settings are needed.
-#      8.0-,   set ASCIIDOC8.
+#      -7.1.2, set ASCIIDOC7
+#      8.0-,   no extra settings are needed
 #
 
 #
 # For docbook-xsl ...
-#      -1.68.1,        set ASCIIDOC_NO_ROFF? (based on changelog from 1.73.0)
-#      1.69.0,         no extra settings are needed?
+#      -1.68.1,        no extra settings are needed?
+#      1.69.0,         set ASCIIDOC_ROFF?
 #      1.69.1-1.71.0,  set DOCBOOK_SUPPRESS_SP?
-#      1.71.1,         no extra settings are needed?
+#      1.71.1,         set ASCIIDOC_ROFF?
 #      1.72.0,         set DOCBOOK_XSL_172.
-#      1.73.0-,        set ASCIIDOC_NO_ROFF
+#      1.73.0-,        no extra settings are needed
 #
 
-#
-# If you had been using DOCBOOK_XSL_172 in an attempt to get rid
-# of 'the ".ft C" problem' in your generated manpages, and you
-# instead ended up with weird characters around callouts, try
-# using ASCIIDOC_NO_ROFF instead (it works fine with ASCIIDOC8).
-#
-
-ifdef ASCIIDOC8
+ifndef ASCIIDOC7
 ASCIIDOC_EXTRA += -a asciidoc7compatible -a no-inline-literal
 endif
 ifdef DOCBOOK_XSL_172
 ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
 MANPAGE_XSL = manpage-1.72.xsl
 else
-       ifdef ASCIIDOC_NO_ROFF
+       ifndef ASCIIDOC_ROFF
        # docbook-xsl after 1.72 needs the regular XSL, but will not
        # pass-thru raw roff codes from asciidoc.conf, so turn them off.
        ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
@@ -204,7 +197,7 @@ install-pdf: pdf
 install-html: html
        '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
 
-../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+../GIT-VERSION-FILE: FORCE
        $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 
 -include ../GIT-VERSION-FILE
@@ -264,7 +257,9 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
        mv $@+ $@
 
 user-manual.xml: user-manual.txt user-manual.conf
-       $(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book $<
+       $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+       $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book -o $@+ $< && \
+       mv $@+ $@
 
 technical/api-index.txt: technical/api-index-skel.txt \
        technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -277,8 +272,10 @@ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
 XSLT = docbook.xsl
 XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
 
-user-manual.html: user-manual.xml
-       $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
+user-manual.html: user-manual.xml $(XSLT)
+       $(QUIET_XSLTPROC)$(RM) $@+ $@ && \
+       xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
+       mv $@+ $@
 
 git.info: user-manual.texi
        $(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
@@ -337,4 +334,4 @@ quick-install-man:
 quick-install-html:
        '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
 
-.PHONY: .FORCE-GIT-VERSION-FILE
+.PHONY: FORCE
similarity index 96%
rename from Documentation/RelNotes-1.5.6.3.txt
rename to Documentation/RelNotes/1.5.6.3.txt
index 9426112..f61dd35 100644 (file)
@@ -4,7 +4,7 @@ GIT v1.5.6.3 Release Notes
 Fixes since v1.5.6.2
 --------------------
 
-* Setting core.sharerepository to traditional "true" value was supposed to make
+* Setting core.sharedrepository to traditional "true" value was supposed to make
   the repository group writable but should not affect permission for others.
   However, since 1.5.6, it was broken to drop permission for others when umask is
   022, making the repository unreadable by others.
similarity index 97%
rename from Documentation/RelNotes-1.6.0.2.txt
rename to Documentation/RelNotes/1.6.0.2.txt
index 51b32f5..e1e24b3 100644 (file)
@@ -17,7 +17,7 @@ Fixes since v1.6.0.1
 * Many commands did not use the correct working tree location when used
   with GIT_WORK_TREE environment settings.
 
-* Some systems needs to use compatibility fnmach and regex libraries
+* Some systems need to use compatibility fnmatch and regex libraries
   independent from each other; the compat/ area has been reorganized to
   allow this.
 
similarity index 94%
rename from Documentation/RelNotes-1.6.4.3.txt
rename to Documentation/RelNotes/1.6.4.3.txt
index 4f29bab..5643e65 100644 (file)
@@ -11,7 +11,7 @@ Fixes since v1.6.4.2
   been deprecated.
 
 * "git fetch" and "git clone" had an extra sanity check to verify the
-  presense of the corresponding *.pack file before downloading *.idx
+  presence of the corresponding *.pack file before downloading *.idx
   file by issuing a HEAD request.  Github server however sometimes
   gave 500 (Internal server error) response to HEAD even if a GET
   request for *.pack file to the same URL would have succeeded, and broke
diff --git a/Documentation/RelNotes/1.6.4.5.txt b/Documentation/RelNotes/1.6.4.5.txt
new file mode 100644 (file)
index 0000000..eb6307d
--- /dev/null
@@ -0,0 +1,20 @@
+Git v1.6.4.5 Release Notes
+==========================
+
+Fixes since v1.6.4.4
+--------------------
+
+ * Simplified base85 implementation.
+
+ * An overlong line after ".gitdir: " in a git file caused out of bounds
+   access to an array on the stack.
+
+ * "git count-objects" did not handle packs larger than 4G.
+
+ * "git rev-parse --parseopt --stop-at-non-option" did not stop at non option
+   when --keep-dashdash was in effect.
+
+ * "gitweb" can sometimes be tricked into parrotting a filename argument
+   given in a request without properly quoting.
+
+Other minor fixes and documentation updates are included.
similarity index 99%
rename from Documentation/RelNotes-1.6.5.4.txt
rename to Documentation/RelNotes/1.6.5.4.txt
index e42f8b2..d3a2a3e 100644 (file)
@@ -26,7 +26,7 @@ Fixes since v1.6.5.3
    future versions, but not in this release,
 
  * "git merge -m <message> <branch>..." added the standard merge message
-   on its own after user-supplied message, which should have overrided the
+   on its own after user-supplied message, which should have overridden the
    standard one.
 
 Other minor documentation updates are included.
similarity index 98%
rename from Documentation/RelNotes-1.6.5.7.txt
rename to Documentation/RelNotes/1.6.5.7.txt
index 5b49ea5..dc5302c 100644 (file)
@@ -10,7 +10,7 @@ Fixes since v1.6.5.6
   an older version of git should just ignore them.  Instead we diagnosed
   it as an error.
 
-* With help.autocorrect set to non-zero value, the logic to guess typoes
+* With help.autocorrect set to non-zero value, the logic to guess typos
   in the subcommand name misfired and ran a random nonsense command.
 
 * If a command is run with an absolute path as a pathspec inside a bare
diff --git a/Documentation/RelNotes/1.6.5.9.txt b/Documentation/RelNotes/1.6.5.9.txt
new file mode 100644 (file)
index 0000000..bb469dd
--- /dev/null
@@ -0,0 +1,18 @@
+Git v1.6.5.9 Release Notes
+==========================
+
+Fixes since v1.6.5.8
+--------------------
+
+ * An overlong line after ".gitdir: " in a git file caused out of bounds
+   access to an array on the stack.
+
+ * "git blame -L $start,$end" segfaulted when too large $start was given.
+
+ * "git rev-parse --parseopt --stop-at-non-option" did not stop at non option
+   when --keep-dashdash was in effect.
+
+ * "gitweb" can sometimes be tricked into parrotting a filename argument
+   given in a request without properly quoting.
+
+Other minor fixes and documentation updates are included.
diff --git a/Documentation/RelNotes/1.6.6.2.txt b/Documentation/RelNotes/1.6.6.2.txt
new file mode 100644 (file)
index 0000000..4eaddc0
--- /dev/null
@@ -0,0 +1,46 @@
+Git v1.6.6.2 Release Notes
+==========================
+
+Fixes since v1.6.6.1
+--------------------
+
+ * recursive merge didn't correctly diagnose its own programming errors,
+   and instead caused the caller to segfault.
+
+ * The new "smart http" aware clients probed the web servers to see if
+   they support smart http, but did not fall back to dumb http transport
+   correctly with some servers.
+
+ * Time based reflog syntax e.g. "@{yesterday}" didn't diagnose a misspelled
+   time specification and instead assumed "@{now}".
+
+ * "git archive HEAD -- no-such-directory" produced an empty archive
+   without complaining.
+
+ * "git blame -L start,end -- file" misbehaved when given a start that is
+   larger than the number of lines in the file.
+
+ * "git checkout -m" didn't correctly call custom merge backend supplied
+   by the end user.
+
+ * "git config -f <file>" misbehaved when run from a subdirectory.
+
+ * "git cvsserver" didn't like having regex metacharacters (e.g. '+') in
+   CVSROOT environment.
+
+ * "git fast-import" did not correctly handle large blobs that may
+   bust the pack size limit.
+
+ * "git gui" is supposed to work even when launched from inside a .git
+   directory.
+
+ * "git gui" misbehaved when applying a hunk that ends with deletion.
+
+ * "git imap-send" did not honor imap.preformattedHTML as documented.
+
+ * "git log" family incorrectly showed the commit notes unconditionally by
+   mistake, which was especially irritating when running "git log --oneline".
+
+ * "git status" shouldn't require an write access to the repository.
+
+Other minor documentation updates are included.
diff --git a/Documentation/RelNotes/1.6.6.3.txt b/Documentation/RelNotes/1.6.6.3.txt
new file mode 100644 (file)
index 0000000..11483ac
--- /dev/null
@@ -0,0 +1,23 @@
+Git v1.6.6.3 Release Notes
+==========================
+
+Fixes since v1.6.6.2
+--------------------
+
+ * An overlong line after ".gitdir: " in a git file caused out of bounds
+   access to an array on the stack.
+
+ * "git bisect $path" did not correctly diagnose an error when given a
+   non-existent path.
+
+ * "git blame -L $start,$end" segfaulted when too large $start was given.
+
+ * "git imap-send" did not write draft box with CRLF line endings per RFC.
+
+ * "git rev-parse --parseopt --stop-at-non-option" did not stop at non option
+   when --keep-dashdash was in effect.
+
+ * "gitweb" can sometimes be tricked into parrotting a filename argument
+   given in a request without properly quoting.
+
+Other minor fixes and documentation updates are included.
similarity index 98%
rename from Documentation/RelNotes-1.6.6.txt
rename to Documentation/RelNotes/1.6.6.txt
index 04e205c..c50b59c 100644 (file)
@@ -29,7 +29,7 @@ or adjust to the new behaviour, on the day their sysadmin decides to install
 the new version of git.  When we switched from "git-foo" to "git foo" in
 1.6.0, even though the change had been advertised and the transition
 guide had been provided for a very long time, the users procrastinated
-during the entire transtion period, and ended up panicking on the day
+during the entire transition period, and ended up panicking on the day
 their sysadmins updated their git installation.  We are trying to avoid
 repeating that unpleasantness in the 1.7.0 release.
 
@@ -94,7 +94,7 @@ users will fare this time.
  * "git diff" traditionally treated various "ignore whitespace" options
    only as a way to filter the patch output.  "git diff --exit-code -b"
    exited with non-zero status even if all changes were about changing the
-   ammount of whitespace and nothing else.  and "git diff -b" showed the
+   amount of whitespace and nothing else.  and "git diff -b" showed the
    "diff --git" header line for such a change without patch text.
 
    In 1.7.0, the "ignore whitespaces" will affect the semantics of the
diff --git a/Documentation/RelNotes/1.7.0.1.txt b/Documentation/RelNotes/1.7.0.1.txt
new file mode 100644 (file)
index 0000000..8ff5bca
--- /dev/null
@@ -0,0 +1,35 @@
+Git v1.7.0.1 Release Notes
+==========================
+
+Fixes since v1.7.0
+------------------
+
+ * In a freshly created repository "rev-parse HEAD^0" complained that
+   it is dangling symref, even though "rev-parse HEAD" didn't.
+
+ * "git show :no-such-name" tried to access the index without bounds
+   check, leading to a potential segfault.
+
+ * Message from "git cherry-pick" was harder to read and use than necessary
+   when it stopped due to conflicting changes.
+
+ * We referred to ".git/refs/" throughout the documentation when we
+   meant to talk about abstract notion of "ref namespace".  Because
+   people's repositories often have packed refs these days, this was
+   confusing.
+
+ * "git diff --output=/path/that/cannot/be/written" did not correctly
+   error out.
+
+ * "git grep -e -pattern-that-begin-with-dash paths..." could not be
+   spelled as "git grep -- -pattern-that-begin-with-dash paths..." which
+   would be a GNU way to use "--" as "end of options".
+
+ * "git grep" compiled with threading support tried to access an
+   uninitialized mutex on boxes with a single CPU.
+
+ * "git stash pop -q --index" failed because the unnecessary --index
+   option was propagated to "git stash drop" that is internally run at the
+   end.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.2.txt b/Documentation/RelNotes/1.7.0.2.txt
new file mode 100644 (file)
index 0000000..fcb46ca
--- /dev/null
@@ -0,0 +1,40 @@
+Git v1.7.0.2 Release Notes
+==========================
+
+Fixes since v1.7.0.1
+--------------------
+
+ * GIT_PAGER was not honored consistently by some scripted Porcelains, most
+   notably "git am".
+
+ * updating working tree files after telling git to add them to the
+   index and while it is still working created garbage object files in
+   the repository without diagnosing it as an error.
+
+ * "git bisect -- pathspec..." did not diagnose an error condition properly when
+   the simplification with given pathspec made the history empty.
+
+ * "git rev-list --cherry-pick A...B" now has an obvious optimization when the
+   histories haven't diverged (i.e. when one end is an ancestor of the other).
+
+ * "git diff --quiet -w" did not work as expected.
+
+ * "git fast-import" didn't work with a large input, as it lacked support
+   for producing the pack index in v2 format.
+
+ * "git imap-send" didn't use CRLF line endings over the imap protocol
+   when storing its payload to the draft box, violating RFC 3501.
+
+ * "git log --format='%w(x,y,z)%b'" and friends that rewrap message
+   has been optimized for utf-8 payload.
+
+ * Error messages generated on the receiving end did not come back to "git
+   push".
+
+ * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series
+   to speed up scanning of large working tree.
+
+ * "gitweb" did not diagnose parsing errors properly while reading tis configuration
+   file.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.3.txt b/Documentation/RelNotes/1.7.0.3.txt
new file mode 100644 (file)
index 0000000..3b35573
--- /dev/null
@@ -0,0 +1,34 @@
+Git v1.7.0.3 Release Notes
+==========================
+
+Fixes since v1.7.0.2
+--------------------
+
+ * Object files are created in a more ACL friendly way in repositories
+   where group permission is ACL controlled.
+
+ * "git add -i" didn't handle a deleted path very well.
+
+ * "git blame" padded line numbers with one extra SP when the total number
+   of lines was one less than multiple of ten due to an off-by-one error.
+
+ * "git fetch --all/--multi" used to discard information for remotes that
+   are fetched earlier.
+
+ * "git log --author=me --grep=it" tried to find commits that have "it"
+   or are written by "me", instead of the ones that have "it" _and_ are
+   written by "me".
+
+ * "git log -g branch" misbehaved when there was no entries in the reflog
+   for the named branch.
+
+ * "git mailinfo" (hence "git am") incorrectly removed initial indent from
+   paragraphs.
+
+ * "git prune" and "git reflog" (hence "git gc" as well) didn't honor
+   an instruction never to expire by setting gc.reflogexpire to never.
+
+ * "git push" misbehaved when branch.<name>.merge was configured without
+   matching branch.<name>.remote.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.4.txt b/Documentation/RelNotes/1.7.0.4.txt
new file mode 100644 (file)
index 0000000..cf7f60e
--- /dev/null
@@ -0,0 +1,27 @@
+Git v1.7.0.4 Release Notes
+==========================
+
+Fixes since v1.7.0.3
+--------------------
+
+ * Optimized ntohl/htonl on big-endian machines were broken.
+
+ * Color values given to "color.<cmd>.<slot>" configuration can now have
+   more than one attributes (e.g. "bold ul").
+
+ * "git add -u nonexistent-path" did not complain.
+
+ * "git apply --whitespace=fix" didn't work well when an early patch in
+   a patch series adds trailing blank lines and a later one depended on
+   such a block of blank lines at the end.
+
+ * "git fast-export" didn't check error status and stop when marks file
+   cannot be opened.
+
+ * "git format-patch --ignore-if-in-upstream" gave unwarranted errors
+   when the range was empty, instead of silently finishing.
+
+ * "git remote prune" did not detect remote tracking refs that became
+   dangling correctly.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.5.txt b/Documentation/RelNotes/1.7.0.5.txt
new file mode 100644 (file)
index 0000000..3149c91
--- /dev/null
@@ -0,0 +1,26 @@
+Git v1.7.0.5 Release Notes
+==========================
+
+Fixes since v1.7.0.4
+--------------------
+
+ * "git daemon" failed to compile on platforms without sockaddr_storage type.
+
+ * Output from "git rev-list --pretty=oneline" was unparsable when a
+   commit did not have any message, which is abnormal but possible in a
+   repository converted from foreign scm.
+
+ * "git stash show <commit-that-is-not-a-stash>" gave an error message
+   that was not so useful.  Reworded the message to "<it> is not a
+   stash".
+
+ * Python scripts in contrib/ area now start with "#!/usr/bin/env python"
+   to honor user's PATH.
+
+ * "git imap-send" used to mistake any line that begins with "From " as a
+   message separator in format-patch output.
+
+ * Smart http server backend failed to report an internal server error and
+   infinitely looped instead after output pipe was closed.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.6.txt b/Documentation/RelNotes/1.7.0.6.txt
new file mode 100644 (file)
index 0000000..b2852b6
--- /dev/null
@@ -0,0 +1,13 @@
+Git v1.7.0.6 Release Notes
+==========================
+
+Fixes since v1.7.0.5
+--------------------
+
+ * "git diff --stat" used "int" to count the size of differences,
+   which could result in overflowing.
+
+ * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike
+   newer tools in the git toolset.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.7.txt b/Documentation/RelNotes/1.7.0.7.txt
new file mode 100644 (file)
index 0000000..d0cb7ca
--- /dev/null
@@ -0,0 +1,16 @@
+Git v1.7.0.7 Release Notes
+==========================
+
+Fixes since v1.7.0.6
+--------------------
+
+ * "make NO_CURL=NoThanks install" was broken.
+
+ * An overlong line after ".gitdir: " in a git file caused out of bounds
+   access to an array on the stack.
+
+ * "git config --path conf.var" to attempt to expand a variable conf.var
+   that uses "~/" short-hand segfaulted when $HOME environment variable
+   was not set.
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.0.8.txt b/Documentation/RelNotes/1.7.0.8.txt
new file mode 100644 (file)
index 0000000..7f05b48
--- /dev/null
@@ -0,0 +1,10 @@
+Git v1.7.0.8 Release Notes
+==========================
+
+This is primarily to backport support for the new "add.ignoreErrors"
+name given to the existing "add.ignore-errors" configuration variable.
+
+The next version, Git 1.7.4, and future versions, will support both
+old and incorrect name and the new corrected name, but without this
+backport, users who want to use the new name "add.ignoreErrors" in
+their repositories cannot use older versions of Git.
diff --git a/Documentation/RelNotes/1.7.0.9.txt b/Documentation/RelNotes/1.7.0.9.txt
new file mode 100644 (file)
index 0000000..bfb3166
--- /dev/null
@@ -0,0 +1,8 @@
+Git v1.7.0.9 Release Notes
+==========================
+
+Fixes since v1.7.0.8
+--------------------
+
+ * "gitweb" can sometimes be tricked into parrotting a filename argument
+   given in a request without properly quoting.
diff --git a/Documentation/RelNotes/1.7.0.txt b/Documentation/RelNotes/1.7.0.txt
new file mode 100644 (file)
index 0000000..0bb8c0b
--- /dev/null
@@ -0,0 +1,214 @@
+Git v1.7.0 Release Notes
+========================
+
+Notes on behaviour change
+-------------------------
+
+ * "git push" into a branch that is currently checked out (i.e. pointed at by
+   HEAD in a repository that is not bare) is refused by default.
+
+   Similarly, "git push $there :$killed" to delete the branch $killed
+   in a remote repository $there, when $killed branch is the current
+   branch pointed at by its HEAD, will be refused by default.
+
+   Setting the configuration variables receive.denyCurrentBranch and
+   receive.denyDeleteCurrent to 'ignore' in the receiving repository
+   can be used to override these safety features.
+
+ * "git send-email" does not make deep threads by default when sending a
+   patch series with more than two messages.  All messages will be sent
+   as a reply to the first message, i.e. cover letter.
+
+   It has been possible already to configure send-email to send "shallow thread"
+   by setting sendemail.chainreplyto configuration variable to false.  The
+   only thing this release does is to change the default when you haven't
+   configured that variable.
+
+ * "git status" is not "git commit --dry-run" anymore.  This change does
+   not affect you if you run the command without argument.
+
+ * "git diff" traditionally treated various "ignore whitespace" options
+   only as a way to filter the patch output.  "git diff --exit-code -b"
+   exited with non-zero status even if all changes were about changing the
+   amount of whitespace and nothing else;  and "git diff -b" showed the
+   "diff --git" header line for such a change without patch text.
+
+   In this release, the "ignore whitespaces" options affect the semantics
+   of the diff operation.  A change that does not affect anything but
+   whitespaces is reported with zero exit status when run with
+   --exit-code, and there is no "diff --git" header for such a change.
+
+ * External diff and textconv helpers are now executed using the shell.
+   This makes them consistent with other programs executed by git, and
+   allows you to pass command-line parameters to the helpers. Any helper
+   paths containing spaces or other metacharacters now need to be
+   shell-quoted.  The affected helpers are GIT_EXTERNAL_DIFF in the
+   environment, and diff.*.command and diff.*.textconv in the config
+   file.
+
+ * The --max-pack-size argument to 'git repack', 'git pack-objects', and
+   'git fast-import' was assuming the provided size to be expressed in MiB,
+   unlike the corresponding config variable and other similar options accepting
+   a size value.  It is now expecting a size expressed in bytes, with a possible
+   unit suffix of 'k', 'm', or 'g'.
+
+Updates since v1.6.6
+--------------------
+
+(subsystems)
+
+ * "git fast-import" updates; adds "option" and "feature" to detect the
+   mismatch between fast-import and the frontends that produce the input
+   stream.
+
+ * "git svn" support of subversion "merge tickets" and miscellaneous fixes.
+
+ * "gitk" and "git gui" translation updates.
+
+ * "gitweb" updates (code clean-up, load checking etc.)
+
+(portability)
+
+ * Some more MSVC portability patches for msysgit port.
+
+ * Minimum Pthreads emulation for msysgit port.
+
+(performance)
+
+ * More performance improvement patches for msysgit port.
+
+(usability, bells and whistles)
+
+ * More commands learned "--quiet" and "--[no-]progress" options.
+
+ * Various commands given by the end user (e.g. diff.type.textconv,
+   and GIT_EDITOR) can be specified with command line arguments.  E.g. it
+   is now possible to say "[diff "utf8doc"] textconv = nkf -w".
+
+ * "sparse checkout" feature allows only part of the work tree to be
+   checked out.
+
+ * HTTP transfer can use authentication scheme other than basic
+   (i.e./e.g. digest).
+
+ * Switching from a version of superproject that used to have a submodule
+   to another version of superproject that no longer has it did not remove
+   the submodule directory when it should (namely, when you are not
+   interested in the submodule at all and didn't clone/checkout).
+
+ * A new attribute conflict-marker-size can be used to change the size of
+   the conflict markers from the default 7; this is useful when tracked
+   contents (e.g. git-merge documentation) have strings that resemble the
+   conflict markers.
+
+ * A new syntax "<branch>@{upstream}" can be used on the command line to
+   substitute the name of the "upstream" of the branch.  Missing branch
+   defaults to the current branch, so "git fetch && git merge @{upstream}"
+   will be equivalent to "git pull".
+
+ * "git am --resolved" has a synonym "git am --continue".
+
+ * "git branch --set-upstream" can be used to update the (surprise!) upstream,
+   i.e. where the branch is supposed to pull and merge from (or rebase onto).
+
+ * "git checkout A...B" is a way to detach HEAD at the merge base between
+   A and B.
+
+ * "git checkout -m path" to reset the work tree file back into the
+   conflicted state works even when you already ran "git add path" and
+   resolved the conflicts.
+
+ * "git commit --date='<date>'" can be used to override the author date
+   just like "git commit --author='<name> <email>'" can be used to
+   override the author identity.
+
+ * "git commit --no-status" can be used to omit the listing of the index
+   and the work tree status in the editor used to prepare the log message.
+
+ * "git commit" warns a bit more aggressively until you configure user.email,
+   whose default value almost always is not (and fundamentally cannot be)
+   what you want.
+
+ * "git difftool" has been extended to make it easier to integrate it
+   with gitk.
+
+ * "git fetch --all" can now be used in place of "git remote update".
+
+ * "git grep" does not rely on external grep anymore.  It can use more than
+   one thread to accelerate the operation.
+
+ * "git grep" learned "--quiet" option.
+
+ * "git log" and friends learned "--glob=heads/*" syntax that is a more
+   flexible way to complement "--branches/--tags/--remotes".
+
+ * "git merge" learned to pass options specific to strategy-backends.  E.g.
+
+    - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
+      strategy how much to shift the trees explicitly.
+
+    - "git merge -Xtheirs" can be used to auto-merge as much as possible,
+      while discarding your own changes and taking merged version in
+      conflicted regions.
+
+ * "git push" learned "git push origin --delete branch", a syntactic sugar
+   for "git push origin :branch".
+
+ * "git push" learned "git push --set-upstream origin forker:forkee" that
+   lets you configure your "forker" branch to later pull from "forkee"
+   branch at "origin".
+
+ * "git rebase --onto A...B" means the history is replayed on top of the
+   merge base between A and B.
+
+ * "git rebase -i" learned new action "fixup" that squashes the change
+   but does not affect existing log message.
+
+ * "git rebase -i" also learned --autosquash option that is useful
+   together with the new "fixup" action.
+
+ * "git remote" learned set-url subcommand that updates (surprise!) url
+   for an existing remote nickname.
+
+ * "git rerere" learned "forget path" subcommand.  Together with "git
+   checkout -m path" it will be useful when you recorded a wrong
+   resolution.
+
+ * Use of "git reset --merge" has become easier when resetting away a
+   conflicted mess left in the work tree.
+
+ * "git rerere" had rerere.autoupdate configuration but there was no way
+   to countermand it from the command line; --no-rerere-autoupdate option
+   given to "merge", "revert", etc. fixes this.
+
+ * "git status" learned "-s(hort)" output format.
+
+(developers)
+
+ * The infrastructure to build foreign SCM interface has been updated.
+
+ * Many more commands are now built-in.
+
+ * THREADED_DELTA_SEARCH is no more.  If you build with threads, delta
+   compression will always take advantage of it.
+
+Fixes since v1.6.6
+------------------
+
+All of the fixes in v1.6.6.X maintenance series are included in this
+release, unless otherwise noted.
+
+ * "git branch -d branch" used to refuse deleting the branch even when
+   the branch is fully merged to its upstream branch if it is not merged
+   to the current branch.  It now deletes it in such a case.
+
+ * "filter-branch" command incorrectly said --prune-empty and --filter-commit
+   were incompatible; the latter should be read as --commit-filter.
+
+ * When using "git status" or asking "git diff" to compare the work tree
+   with something, they used to consider that a checked-out submodule with
+   uncommitted changes is not modified; this could cause people to forget
+   committing these changes in the submodule before committing in the
+   superproject. They now consider such a change as a modification and
+   "git diff" will append a "-dirty" to the work tree side when generating
+   patch output or when used with the --submodule option.
diff --git a/Documentation/RelNotes/1.7.1.1.txt b/Documentation/RelNotes/1.7.1.1.txt
new file mode 100644 (file)
index 0000000..3f6b314
--- /dev/null
@@ -0,0 +1,96 @@
+Git v1.7.1.1 Release Notes
+==========================
+
+Fixes since v1.7.1
+------------------
+
+ * Authentication over http transport can now be made lazily, in that the
+   request can first go to a URL without username, get a 401 response and
+   then the client will ask for the username to use.
+
+ * We used to mistakenly think "../work" is a subdirectory of the current
+   directory when we are in "../work-xyz".
+
+ * The attribute mechanism now allows an entry that uses an attribute
+   macro that set/unset one attribute, immediately followed by an
+   overriding setting; this makes attribute macros much easier to use.
+
+ * We&nb