summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes6
-rw-r--r--.gitignore225
-rw-r--r--.mailmap69
-rw-r--r--COPYING360
-rw-r--r--Documentation/.gitattributes1
-rw-r--r--Documentation/.gitignore11
-rw-r--r--Documentation/CodingGuidelines134
-rw-r--r--Documentation/Makefile344
-rw-r--r--Documentation/RelNotes/1.5.0.1.txt42
-rw-r--r--Documentation/RelNotes/1.5.0.2.txt65
-rw-r--r--Documentation/RelNotes/1.5.0.3.txt58
-rw-r--r--Documentation/RelNotes/1.5.0.4.txt22
-rw-r--r--Documentation/RelNotes/1.5.0.5.txt26
-rw-r--r--Documentation/RelNotes/1.5.0.6.txt21
-rw-r--r--Documentation/RelNotes/1.5.0.7.txt18
-rw-r--r--Documentation/RelNotes/1.5.0.txt469
-rw-r--r--Documentation/RelNotes/1.5.1.1.txt65
-rw-r--r--Documentation/RelNotes/1.5.1.2.txt50
-rw-r--r--Documentation/RelNotes/1.5.1.3.txt45
-rw-r--r--Documentation/RelNotes/1.5.1.4.txt30
-rw-r--r--Documentation/RelNotes/1.5.1.5.txt42
-rw-r--r--Documentation/RelNotes/1.5.1.6.txt45
-rw-r--r--Documentation/RelNotes/1.5.1.txt371
-rw-r--r--Documentation/RelNotes/1.5.2.1.txt53
-rw-r--r--Documentation/RelNotes/1.5.2.2.txt61
-rw-r--r--Documentation/RelNotes/1.5.2.3.txt27
-rw-r--r--Documentation/RelNotes/1.5.2.4.txt28
-rw-r--r--Documentation/RelNotes/1.5.2.5.txt30
-rw-r--r--Documentation/RelNotes/1.5.2.txt197
-rw-r--r--Documentation/RelNotes/1.5.3.1.txt10
-rw-r--r--Documentation/RelNotes/1.5.3.2.txt58
-rw-r--r--Documentation/RelNotes/1.5.3.3.txt31
-rw-r--r--Documentation/RelNotes/1.5.3.4.txt35
-rw-r--r--Documentation/RelNotes/1.5.3.5.txt94
-rw-r--r--Documentation/RelNotes/1.5.3.6.txt48
-rw-r--r--Documentation/RelNotes/1.5.3.7.txt45
-rw-r--r--Documentation/RelNotes/1.5.3.8.txt25
-rw-r--r--Documentation/RelNotes/1.5.3.txt366
-rw-r--r--Documentation/RelNotes/1.5.4.1.txt17
-rw-r--r--Documentation/RelNotes/1.5.4.2.txt43
-rw-r--r--Documentation/RelNotes/1.5.4.3.txt27
-rw-r--r--Documentation/RelNotes/1.5.4.4.txt66
-rw-r--r--Documentation/RelNotes/1.5.4.5.txt56
-rw-r--r--Documentation/RelNotes/1.5.4.6.txt43
-rw-r--r--Documentation/RelNotes/1.5.4.7.txt10
-rw-r--r--Documentation/RelNotes/1.5.4.txt377
-rw-r--r--Documentation/RelNotes/1.5.5.1.txt44
-rw-r--r--Documentation/RelNotes/1.5.5.2.txt27
-rw-r--r--Documentation/RelNotes/1.5.5.3.txt12
-rw-r--r--Documentation/RelNotes/1.5.5.4.txt7
-rw-r--r--Documentation/RelNotes/1.5.5.5.txt11
-rw-r--r--Documentation/RelNotes/1.5.5.6.txt10
-rw-r--r--Documentation/RelNotes/1.5.5.txt207
-rw-r--r--Documentation/RelNotes/1.5.6.1.txt28
-rw-r--r--Documentation/RelNotes/1.5.6.2.txt40
-rw-r--r--Documentation/RelNotes/1.5.6.3.txt52
-rw-r--r--Documentation/RelNotes/1.5.6.4.txt47
-rw-r--r--Documentation/RelNotes/1.5.6.5.txt29
-rw-r--r--Documentation/RelNotes/1.5.6.6.txt10
-rw-r--r--Documentation/RelNotes/1.5.6.txt115
-rw-r--r--Documentation/RelNotes/1.6.0.1.txt36
-rw-r--r--Documentation/RelNotes/1.6.0.2.txt87
-rw-r--r--Documentation/RelNotes/1.6.0.3.txt117
-rw-r--r--Documentation/RelNotes/1.6.0.4.txt39
-rw-r--r--Documentation/RelNotes/1.6.0.5.txt56
-rw-r--r--Documentation/RelNotes/1.6.0.6.txt33
-rw-r--r--Documentation/RelNotes/1.6.0.txt258
-rw-r--r--Documentation/RelNotes/1.6.1.1.txt59
-rw-r--r--Documentation/RelNotes/1.6.1.2.txt39
-rw-r--r--Documentation/RelNotes/1.6.1.3.txt32
-rw-r--r--Documentation/RelNotes/1.6.1.4.txt44
-rw-r--r--Documentation/RelNotes/1.6.1.txt286
-rw-r--r--Documentation/RelNotes/1.6.2.1.txt19
-rw-r--r--Documentation/RelNotes/1.6.2.2.txt45
-rw-r--r--Documentation/RelNotes/1.6.2.3.txt22
-rw-r--r--Documentation/RelNotes/1.6.2.4.txt39
-rw-r--r--Documentation/RelNotes/1.6.2.5.txt21
-rw-r--r--Documentation/RelNotes/1.6.2.txt164
-rw-r--r--Documentation/RelNotes/1.6.3.1.txt10
-rw-r--r--Documentation/RelNotes/1.6.3.2.txt61
-rw-r--r--Documentation/RelNotes/1.6.3.3.txt38
-rw-r--r--Documentation/RelNotes/1.6.3.4.txt36
-rw-r--r--Documentation/RelNotes/1.6.3.txt182
-rw-r--r--Documentation/RelNotes/1.6.4.1.txt46
-rw-r--r--Documentation/RelNotes/1.6.4.2.txt32
-rw-r--r--Documentation/RelNotes/1.6.4.3.txt29
-rw-r--r--Documentation/RelNotes/1.6.4.4.txt26
-rw-r--r--Documentation/RelNotes/1.6.4.txt147
-rw-r--r--Documentation/RelNotes/1.6.5.1.txt20
-rw-r--r--Documentation/RelNotes/1.6.5.2.txt19
-rw-r--r--Documentation/RelNotes/1.6.5.3.txt63
-rw-r--r--Documentation/RelNotes/1.6.5.4.txt32
-rw-r--r--Documentation/RelNotes/1.6.5.5.txt49
-rw-r--r--Documentation/RelNotes/1.6.5.6.txt23
-rw-r--r--Documentation/RelNotes/1.6.5.7.txt19
-rw-r--r--Documentation/RelNotes/1.6.5.8.txt28
-rw-r--r--Documentation/RelNotes/1.6.5.txt169
-rw-r--r--Documentation/RelNotes/1.6.6.1.txt37
-rw-r--r--Documentation/RelNotes/1.6.6.2.txt46
-rw-r--r--Documentation/RelNotes/1.6.6.txt224
-rw-r--r--Documentation/RelNotes/1.7.0.1.txt35
-rw-r--r--Documentation/RelNotes/1.7.0.2.txt40
-rw-r--r--Documentation/RelNotes/1.7.0.3.txt34
-rw-r--r--Documentation/RelNotes/1.7.0.4.txt27
-rw-r--r--Documentation/RelNotes/1.7.0.5.txt26
-rw-r--r--Documentation/RelNotes/1.7.0.6.txt13
-rw-r--r--Documentation/RelNotes/1.7.0.7.txt16
-rw-r--r--Documentation/RelNotes/1.7.0.txt214
-rw-r--r--Documentation/RelNotes/1.7.1.1.txt96
-rw-r--r--Documentation/RelNotes/1.7.1.2.txt28
-rw-r--r--Documentation/RelNotes/1.7.1.txt89
-rw-r--r--Documentation/RelNotes/1.7.2.1.txt25
-rw-r--r--Documentation/RelNotes/1.7.2.2.txt22
-rw-r--r--Documentation/RelNotes/1.7.2.3.txt39
-rw-r--r--Documentation/RelNotes/1.7.2.txt151
-rw-r--r--Documentation/RelNotes/1.7.3.txt81
-rw-r--r--Documentation/SubmittingPatches592
-rw-r--r--Documentation/asciidoc.conf95
-rw-r--r--Documentation/blame-options.txt116
-rwxr-xr-xDocumentation/build-docdep.perl46
-rwxr-xr-xDocumentation/cat-texi.perl42
-rwxr-xr-xDocumentation/cmd-list.perl74
-rw-r--r--Documentation/config.txt1852
-rw-r--r--Documentation/date-formats.txt26
-rw-r--r--Documentation/diff-format.txt169
-rw-r--r--Documentation/diff-generate-patch.txt162
-rw-r--r--Documentation/diff-options.txt379
-rw-r--r--Documentation/docbook-xsl.css296
-rw-r--r--Documentation/docbook.xsl8
-rw-r--r--Documentation/everyday.txt413
-rw-r--r--Documentation/fetch-options.txt98
-rwxr-xr-xDocumentation/fix-texi.perl15
-rw-r--r--Documentation/git-add.txt317
-rw-r--r--Documentation/git-am.txt203
-rw-r--r--Documentation/git-annotate.txt36
-rw-r--r--Documentation/git-apply.txt265
-rw-r--r--Documentation/git-archimport.txt120
-rw-r--r--Documentation/git-archive.txt166
-rw-r--r--Documentation/git-bisect-lk2009.txt1358
-rw-r--r--Documentation/git-bisect.txt340
-rw-r--r--Documentation/git-blame.txt203
-rw-r--r--Documentation/git-branch.txt243
-rw-r--r--Documentation/git-bundle.txt210
-rw-r--r--Documentation/git-cat-file.txt113
-rw-r--r--Documentation/git-check-attr.txt100
-rw-r--r--Documentation/git-check-ref-format.txt96
-rw-r--r--Documentation/git-checkout-index.txt189
-rw-r--r--Documentation/git-checkout.txt329
-rw-r--r--Documentation/git-cherry-pick.txt137
-rw-r--r--Documentation/git-cherry.txt76
-rw-r--r--Documentation/git-citool.txt32
-rw-r--r--Documentation/git-clean.txt72
-rw-r--r--Documentation/git-clone.txt245
-rw-r--r--Documentation/git-commit-tree.txt107
-rw-r--r--Documentation/git-commit.txt394
-rw-r--r--Documentation/git-config.txt350
-rw-r--r--Documentation/git-count-objects.txt39
-rw-r--r--Documentation/git-cvsexportcommit.txt125
-rw-r--r--Documentation/git-cvsimport.txt231
-rw-r--r--Documentation/git-cvsserver.txt412
-rw-r--r--Documentation/git-daemon.txt293
-rw-r--r--Documentation/git-describe.txt172
-rw-r--r--Documentation/git-diff-files.txt60
-rw-r--r--Documentation/git-diff-index.txt130
-rw-r--r--Documentation/git-diff-tree.txt176
-rw-r--r--Documentation/git-diff.txt175
-rw-r--r--Documentation/git-difftool.txt120
-rw-r--r--Documentation/git-fast-export.txt149
-rw-r--r--Documentation/git-fast-import.txt1244
-rw-r--r--Documentation/git-fetch-pack.txt104
-rw-r--r--Documentation/git-fetch.txt95
-rw-r--r--Documentation/git-filter-branch.txt420
-rw-r--r--Documentation/git-fmt-merge-msg.txt77
-rw-r--r--Documentation/git-for-each-ref.txt206
-rw-r--r--Documentation/git-format-patch.txt292
-rw-r--r--Documentation/git-fsck-objects.txt17
-rw-r--r--Documentation/git-fsck.txt156
-rw-r--r--Documentation/git-gc.txt160
-rw-r--r--Documentation/git-get-tar-commit-id.txt36
-rw-r--r--Documentation/git-grep.txt218
-rw-r--r--Documentation/git-gui.txt134
-rw-r--r--Documentation/git-hash-object.txt66
-rw-r--r--Documentation/git-help.txt187
-rw-r--r--Documentation/git-http-backend.txt188
-rw-r--r--Documentation/git-http-fetch.txt56
-rw-r--r--Documentation/git-http-push.txt105
-rw-r--r--Documentation/git-imap-send.txt137
-rw-r--r--Documentation/git-index-pack.txt99
-rw-r--r--Documentation/git-init-db.txt18
-rw-r--r--Documentation/git-init.txt148
-rw-r--r--Documentation/git-instaweb.txt97
-rw-r--r--Documentation/git-log.txt194
-rw-r--r--Documentation/git-lost-found.txt81
-rw-r--r--Documentation/git-ls-files.txt222
-rw-r--r--Documentation/git-ls-remote.txt76
-rw-r--r--Documentation/git-ls-tree.txt112
-rw-r--r--Documentation/git-mailinfo.txt96
-rw-r--r--Documentation/git-mailsplit.txt61
-rw-r--r--Documentation/git-merge-base.txt121
-rw-r--r--Documentation/git-merge-file.txt102
-rw-r--r--Documentation/git-merge-index.txt87
-rw-r--r--Documentation/git-merge-one-file.txt29
-rw-r--r--Documentation/git-merge-tree.txt36
-rw-r--r--Documentation/git-merge.txt305
-rw-r--r--Documentation/git-mergetool--lib.txt54
-rw-r--r--Documentation/git-mergetool.txt95
-rw-r--r--Documentation/git-mktag.txt46
-rw-r--r--Documentation/git-mktree.txt47
-rw-r--r--Documentation/git-mv.txt55
-rw-r--r--Documentation/git-name-rev.txt84
-rw-r--r--Documentation/git-notes.txt287
-rw-r--r--Documentation/git-pack-objects.txt239
-rw-r--r--Documentation/git-pack-redundant.txt57
-rw-r--r--Documentation/git-pack-refs.txt66
-rw-r--r--Documentation/git-parse-remote.txt30
-rw-r--r--Documentation/git-patch-id.txt42
-rw-r--r--Documentation/git-peek-remote.txt50
-rw-r--r--Documentation/git-prune-packed.txt54
-rw-r--r--Documentation/git-prune.txt91
-rw-r--r--Documentation/git-pull.txt229
-rw-r--r--Documentation/git-push.txt421
-rw-r--r--Documentation/git-quiltimport.txt62
-rw-r--r--Documentation/git-read-tree.txt438
-rw-r--r--Documentation/git-rebase.txt691
-rw-r--r--Documentation/git-receive-pack.txt165
-rw-r--r--Documentation/git-reflog.txt103
-rw-r--r--Documentation/git-relink.txt37
-rw-r--r--Documentation/git-remote-helpers.txt248
-rw-r--r--Documentation/git-remote.txt229
-rw-r--r--Documentation/git-repack.txt138
-rw-r--r--Documentation/git-replace.txt96
-rw-r--r--Documentation/git-repo-config.txt18
-rw-r--r--Documentation/git-request-pull.txt42
-rw-r--r--Documentation/git-rerere.txt215
-rw-r--r--Documentation/git-reset.txt398
-rw-r--r--Documentation/git-rev-list.txt120
-rw-r--r--Documentation/git-rev-parse.txt318
-rw-r--r--Documentation/git-revert.txt112
-rw-r--r--Documentation/git-rm.txt166
-rw-r--r--Documentation/git-send-email.txt349
-rw-r--r--Documentation/git-send-pack.txt128
-rw-r--r--Documentation/git-sh-setup.txt80
-rw-r--r--Documentation/git-shell.txt35
-rw-r--r--Documentation/git-shortlog.txt82
-rw-r--r--Documentation/git-show-branch.txt216
-rw-r--r--Documentation/git-show-index.txt34
-rw-r--r--Documentation/git-show-ref.txt183
-rw-r--r--Documentation/git-show.txt84
-rw-r--r--Documentation/git-stage.txt19
-rw-r--r--Documentation/git-stash.txt266
-rw-r--r--Documentation/git-status.txt187
-rw-r--r--Documentation/git-stripspace.txt36
-rw-r--r--Documentation/git-submodule.txt267
-rw-r--r--Documentation/git-svn.txt873
-rw-r--r--Documentation/git-symbolic-ref.txt62
-rw-r--r--Documentation/git-tag.txt275
-rw-r--r--Documentation/git-tar-tree.txt89
-rw-r--r--Documentation/git-tools.txt118
-rw-r--r--Documentation/git-unpack-file.txt35
-rw-r--r--Documentation/git-unpack-objects.txt57
-rw-r--r--Documentation/git-update-index.txt379
-rw-r--r--Documentation/git-update-ref.txt93
-rw-r--r--Documentation/git-update-server-info.txt52
-rw-r--r--Documentation/git-upload-archive.txt37
-rw-r--r--Documentation/git-upload-pack.txt46
-rw-r--r--Documentation/git-var.txt78
-rw-r--r--Documentation/git-verify-pack.txt60
-rw-r--r--Documentation/git-verify-tag.txt31
-rw-r--r--Documentation/git-web--browse.txt125
-rw-r--r--Documentation/git-whatchanged.txt79
-rw-r--r--Documentation/git-write-tree.txt50
-rw-r--r--Documentation/git.txt756
-rw-r--r--Documentation/gitattributes.txt871
-rw-r--r--Documentation/gitcli.txt178
-rw-r--r--Documentation/gitcore-tutorial.txt1709
-rw-r--r--Documentation/gitcvs-migration.txt201
-rw-r--r--Documentation/gitdiffcore.txt281
-rw-r--r--Documentation/gitglossary.txt27
-rw-r--r--Documentation/githooks.txt360
-rw-r--r--Documentation/gitignore.txt150
-rw-r--r--Documentation/gitk.txt127
-rw-r--r--Documentation/gitmodules.txt91
-rw-r--r--Documentation/gitrepository-layout.txt209
-rw-r--r--Documentation/gitrevisions.txt35
-rw-r--r--Documentation/gittutorial-2.txt434
-rw-r--r--Documentation/gittutorial.txt673
-rw-r--r--Documentation/gitworkflows.txt479
-rw-r--r--Documentation/glossary-content.txt461
-rwxr-xr-xDocumentation/howto-index.sh56
-rw-r--r--Documentation/howto/maintain-git.txt277
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt163
-rw-r--r--Documentation/howto/rebuild-from-update-hook.txt86
-rw-r--r--Documentation/howto/recover-corrupted-blob-object.txt134
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt269
-rw-r--r--Documentation/howto/revert-branch-rebase.txt187
-rw-r--r--Documentation/howto/separating-topic-branches.txt90
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt277
-rw-r--r--Documentation/howto/update-hook-example.txt192
-rw-r--r--Documentation/howto/use-git-daemon.txt51
-rw-r--r--Documentation/howto/using-merge-subtree.txt75
-rw-r--r--Documentation/i18n.txt57
-rwxr-xr-xDocumentation/install-doc-quick.sh31
-rwxr-xr-xDocumentation/install-webdoc.sh39
-rw-r--r--Documentation/mailmap.txt74
-rw-r--r--Documentation/manpage-1.72.xsl14
-rw-r--r--Documentation/manpage-base-url.xsl.in10
-rw-r--r--Documentation/manpage-base.xsl35
-rw-r--r--Documentation/manpage-bold-literal.xsl17
-rw-r--r--Documentation/manpage-normal.xsl13
-rw-r--r--Documentation/manpage-quote-apos.xsl16
-rw-r--r--Documentation/manpage-suppress-sp.xsl21
-rw-r--r--Documentation/merge-config.txt59
-rw-r--r--Documentation/merge-options.txt83
-rw-r--r--Documentation/merge-strategies.txt82
-rw-r--r--Documentation/pretty-formats.txt195
-rw-r--r--Documentation/pretty-options.txt48
-rw-r--r--Documentation/pt_BR/gittutorial.txt675
-rw-r--r--Documentation/pull-fetch-param.txt73
-rw-r--r--Documentation/rev-list-options.txt732
-rw-r--r--Documentation/revisions.txt199
-rw-r--r--Documentation/technical/.gitignore1
-rw-r--r--Documentation/technical/api-allocation-growing.txt34
-rw-r--r--Documentation/technical/api-builtin.txt68
-rw-r--r--Documentation/technical/api-decorate.txt6
-rw-r--r--Documentation/technical/api-diff.txt166
-rw-r--r--Documentation/technical/api-directory-listing.txt79
-rw-r--r--Documentation/technical/api-gitattributes.txt111
-rw-r--r--Documentation/technical/api-grep.txt8
-rw-r--r--Documentation/technical/api-hash.txt52
-rw-r--r--Documentation/technical/api-history-graph.txt174
-rw-r--r--Documentation/technical/api-in-core-index.txt21
-rw-r--r--Documentation/technical/api-index-skel.txt15
-rwxr-xr-xDocumentation/technical/api-index.sh28
-rw-r--r--Documentation/technical/api-lockfile.txt74
-rw-r--r--Documentation/technical/api-merge.txt73
-rw-r--r--Documentation/technical/api-object-access.txt15
-rw-r--r--Documentation/technical/api-parse-options.txt263
-rw-r--r--Documentation/technical/api-quote.txt10
-rw-r--r--Documentation/technical/api-remote.txt127
-rw-r--r--Documentation/technical/api-revision-walking.txt67
-rw-r--r--Documentation/technical/api-run-command.txt243
-rw-r--r--Documentation/technical/api-setup.txt13
-rw-r--r--Documentation/technical/api-strbuf.txt272
-rw-r--r--Documentation/technical/api-string-list.txt132
-rw-r--r--Documentation/technical/api-tree-walking.txt147
-rw-r--r--Documentation/technical/api-xdiff-interface.txt7
-rw-r--r--Documentation/technical/pack-format.txt160
-rw-r--r--Documentation/technical/pack-heuristics.txt466
-rw-r--r--Documentation/technical/pack-protocol.txt494
-rw-r--r--Documentation/technical/protocol-capabilities.txt187
-rw-r--r--Documentation/technical/protocol-common.txt96
-rw-r--r--Documentation/technical/racy-git.txt197
-rw-r--r--Documentation/technical/send-pack-pipeline.txt63
-rw-r--r--Documentation/technical/shallow.txt49
-rw-r--r--Documentation/technical/trivial-merge.txt121
-rw-r--r--Documentation/urls-remotes.txt94
-rw-r--r--Documentation/urls.txt94
-rw-r--r--Documentation/user-manual.conf21
-rw-r--r--Documentation/user-manual.txt4610
-rwxr-xr-xGIT-VERSION-GEN80
-rw-r--r--INSTALL192
-rw-r--r--Makefile2570
-rw-r--r--README54
l---------RelNotes1
-rw-r--r--abspath.c118
-rw-r--r--aclocal.m440
-rw-r--r--advice.c49
-rw-r--r--advice.h17
-rw-r--r--alias.c87
-rw-r--r--alloc.c76
-rw-r--r--archive-tar.c250
-rw-r--r--archive-zip.c280
-rw-r--r--archive.c397
-rw-r--r--archive.h30
-rw-r--r--attr.c703
-rw-r--r--attr.h41
-rw-r--r--base85.c132
-rw-r--r--bisect.c1011
-rw-r--r--bisect.h34
-rw-r--r--blob.c25
-rw-r--r--blob.h25
-rw-r--r--block-sha1/sha1.c283
-rw-r--r--block-sha1/sha1.h22
-rw-r--r--branch.c225
-rw-r--r--branch.h31
-rw-r--r--builtin.h143
-rw-r--r--builtin/add.c472
-rw-r--r--builtin/annotate.c24
-rw-r--r--builtin/apply.c3937
-rw-r--r--builtin/archive.c129
-rw-r--r--builtin/bisect--helper.c28
-rw-r--r--builtin/blame.c2530
-rw-r--r--builtin/branch.c712
-rw-r--r--builtin/bundle.c65
-rw-r--r--builtin/cat-file.c290
-rw-r--r--builtin/check-attr.c123
-rw-r--r--builtin/check-ref-format.c71
-rw-r--r--builtin/checkout-index.c315
-rw-r--r--builtin/checkout.c919
-rw-r--r--builtin/clean.c186
-rw-r--r--builtin/clone.c672
-rw-r--r--builtin/commit-tree.c65
-rw-r--r--builtin/commit.c1407
-rw-r--r--builtin/config.c502
-rw-r--r--builtin/count-objects.c130
-rw-r--r--builtin/describe.c437
-rw-r--r--builtin/diff-files.c70
-rw-r--r--builtin/diff-index.c52
-rw-r--r--builtin/diff-tree.c182
-rw-r--r--builtin/diff.c429
-rw-r--r--builtin/fast-export.c679
-rw-r--r--builtin/fetch-pack.c976
-rw-r--r--builtin/fetch.c934
-rw-r--r--builtin/fmt-merge-msg.c368
-rw-r--r--builtin/for-each-ref.c1000
-rw-r--r--builtin/fsck.c684
-rw-r--r--builtin/gc.c255
-rw-r--r--builtin/grep.c1114
-rw-r--r--builtin/hash-object.c134
-rw-r--r--builtin/help.c466
-rw-r--r--builtin/index-pack.c1032
-rw-r--r--builtin/init-db.c515
-rw-r--r--builtin/log.c1464
-rw-r--r--builtin/ls-files.c618
-rw-r--r--builtin/ls-remote.c115
-rw-r--r--builtin/ls-tree.c174
-rw-r--r--builtin/mailinfo.c1064
-rw-r--r--builtin/mailsplit.c309
-rw-r--r--builtin/merge-base.c101
-rw-r--r--builtin/merge-file.c101
-rw-r--r--builtin/merge-index.c111
-rw-r--r--builtin/merge-ours.c34
-rw-r--r--builtin/merge-recursive.c91
-rw-r--r--builtin/merge-tree.c359
-rw-r--r--builtin/merge.c1319
-rw-r--r--builtin/mktag.c179
-rw-r--r--builtin/mktree.c190
-rw-r--r--builtin/mv.c227
-rw-r--r--builtin/name-rev.c305
-rw-r--r--builtin/notes.c878
-rw-r--r--builtin/pack-objects.c2345
-rw-r--r--builtin/pack-redundant.c696
-rw-r--r--builtin/pack-refs.c21
-rw-r--r--builtin/patch-id.c154
-rw-r--r--builtin/prune-packed.c86
-rw-r--r--builtin/prune.c165
-rw-r--r--builtin/push.c252
-rw-r--r--builtin/read-tree.c230
-rw-r--r--builtin/receive-pack.c854
-rw-r--r--builtin/reflog.c782
-rw-r--r--builtin/remote.c1549
-rw-r--r--builtin/replace.c159
-rw-r--r--builtin/rerere.c170
-rw-r--r--builtin/reset.c386
-rw-r--r--builtin/rev-list.c420
-rw-r--r--builtin/rev-parse.c734
-rw-r--r--builtin/revert.c596
-rw-r--r--builtin/rm.c272
-rw-r--r--builtin/send-pack.c531
-rw-r--r--builtin/shortlog.c356
-rw-r--r--builtin/show-branch.c968
-rw-r--r--builtin/show-ref.c249
-rw-r--r--builtin/stripspace.c90
-rw-r--r--builtin/symbolic-ref.c57
-rw-r--r--builtin/tag.c487
-rw-r--r--builtin/tar-tree.c103
-rw-r--r--builtin/unpack-file.c38
-rw-r--r--builtin/unpack-objects.c568
-rw-r--r--builtin/update-index.c788
-rw-r--r--builtin/update-ref.c58
-rw-r--r--builtin/update-server-info.c25
-rw-r--r--builtin/upload-archive.c167
-rw-r--r--builtin/var.c94
-rw-r--r--builtin/verify-pack.c166
-rw-r--r--builtin/verify-tag.c114
-rw-r--r--builtin/write-tree.c56
-rw-r--r--bundle.c396
-rw-r--r--bundle.h25
-rw-r--r--cache-tree.c670
-rw-r--r--cache-tree.h48
-rw-r--r--cache.h1119
-rwxr-xr-xcheck-builtins.sh34
-rw-r--r--check-racy.c28
-rwxr-xr-xcheck_bindir13
-rw-r--r--color.c213
-rw-r--r--color.h65
-rw-r--r--combine-diff.c1072
-rw-r--r--command-list.txt134
-rw-r--r--commit.c866
-rw-r--r--commit.h174
-rw-r--r--compat/basename.c15
-rw-r--r--compat/bswap.h48
-rw-r--r--compat/cygwin.c143
-rw-r--r--compat/cygwin.h9
-rw-r--r--compat/fnmatch/fnmatch.c488
-rw-r--r--compat/fnmatch/fnmatch.h84
-rw-r--r--compat/fopen.c37
-rw-r--r--compat/hstrerror.c21
-rw-r--r--compat/inet_ntop.c199
-rw-r--r--compat/inet_pton.c219
-rw-r--r--compat/memmem.c32
-rw-r--r--compat/mingw.c1497
-rw-r--r--compat/mingw.h327
-rw-r--r--compat/mkdtemp.c8
-rw-r--r--compat/mmap.c42
-rw-r--r--compat/msvc.c35
-rw-r--r--compat/msvc.h42
-rw-r--r--compat/nedmalloc/License.txt23
-rw-r--r--compat/nedmalloc/Readme.txt136
-rw-r--r--compat/nedmalloc/malloc.c.h5752
-rw-r--r--compat/nedmalloc/nedmalloc.c966
-rw-r--r--compat/nedmalloc/nedmalloc.h180
-rw-r--r--compat/pread.c18
-rw-r--r--compat/qsort.c62
-rw-r--r--compat/regex/regcomp.c3884
-rw-r--r--compat/regex/regex.c87
-rw-r--r--compat/regex/regex.h582
-rw-r--r--compat/regex/regex_internal.c1744
-rw-r--r--compat/regex/regex_internal.h810
-rw-r--r--compat/regex/regexec.c4369
-rw-r--r--compat/setenv.c34
-rw-r--r--compat/snprintf.c64
-rw-r--r--compat/strcasestr.c22
-rw-r--r--compat/strlcpy.c13
-rw-r--r--compat/strtok_r.c61
-rw-r--r--compat/strtoumax.c10
-rw-r--r--compat/unsetenv.c25
-rw-r--r--compat/vcbuild/README50
-rw-r--r--compat/vcbuild/include/alloca.h1
-rw-r--r--compat/vcbuild/include/arpa/inet.h1
-rw-r--r--compat/vcbuild/include/dirent.h128
-rw-r--r--compat/vcbuild/include/grp.h1
-rw-r--r--compat/vcbuild/include/inttypes.h1
-rw-r--r--compat/vcbuild/include/netdb.h1
-rw-r--r--compat/vcbuild/include/netinet/in.h1
-rw-r--r--compat/vcbuild/include/netinet/tcp.h1
-rw-r--r--compat/vcbuild/include/pwd.h1
-rw-r--r--compat/vcbuild/include/sys/ioctl.h1
-rw-r--r--compat/vcbuild/include/sys/param.h1
-rw-r--r--compat/vcbuild/include/sys/poll.h1
-rw-r--r--compat/vcbuild/include/sys/select.h1
-rw-r--r--compat/vcbuild/include/sys/socket.h1
-rw-r--r--compat/vcbuild/include/sys/time.h1
-rw-r--r--compat/vcbuild/include/sys/utime.h34
-rw-r--r--compat/vcbuild/include/sys/wait.h1
-rw-r--r--compat/vcbuild/include/termios.h1
-rw-r--r--compat/vcbuild/include/unistd.h92
-rw-r--r--compat/vcbuild/include/utime.h1
-rw-r--r--compat/vcbuild/scripts/clink.pl52
-rw-r--r--compat/vcbuild/scripts/lib.pl26
-rw-r--r--compat/win32.h41
-rw-r--r--compat/win32/pthread.c196
-rw-r--r--compat/win32/pthread.h99
-rw-r--r--compat/win32mmap.c41
-rw-r--r--compat/winansi.c357
-rw-r--r--config.c1460
-rw-r--r--config.mak.in70
-rw-r--r--configure.ac953
-rw-r--r--connect.c660
-rw-r--r--contrib/README43
-rw-r--r--contrib/blameview/README9
-rwxr-xr-xcontrib/blameview/blameview.perl155
-rw-r--r--contrib/buildsystems/Generators.pm42
-rw-r--r--contrib/buildsystems/Generators/QMake.pm189
-rw-r--r--contrib/buildsystems/Generators/Vcproj.pm626
-rw-r--r--contrib/buildsystems/engine.pl359
-rw-r--r--contrib/buildsystems/generate29
-rw-r--r--contrib/buildsystems/parse.pl228
-rw-r--r--contrib/ciabot/README12
-rwxr-xr-xcontrib/ciabot/ciabot.py222
-rwxr-xr-xcontrib/ciabot/ciabot.sh192
-rwxr-xr-xcontrib/completion/git-completion.bash2419
-rw-r--r--contrib/continuous/cidaemon503
-rw-r--r--contrib/continuous/post-receive-cinotify104
-rw-r--r--contrib/convert-objects/convert-objects.c329
-rw-r--r--contrib/convert-objects/git-convert-objects.txt28
-rw-r--r--contrib/emacs/.gitignore1
-rw-r--r--contrib/emacs/Makefile21
-rw-r--r--contrib/emacs/README39
-rw-r--r--contrib/emacs/git-blame.el482
-rw-r--r--contrib/emacs/git.el1698
-rw-r--r--contrib/examples/README3
-rw-r--r--contrib/examples/builtin-fetch--tool.c574
-rwxr-xr-xcontrib/examples/git-checkout.sh302
-rwxr-xr-xcontrib/examples/git-clean.sh118
-rwxr-xr-xcontrib/examples/git-clone.sh525
-rwxr-xr-xcontrib/examples/git-commit.sh639
-rwxr-xr-xcontrib/examples/git-fetch.sh379
-rwxr-xr-xcontrib/examples/git-gc.sh37
-rwxr-xr-xcontrib/examples/git-ls-remote.sh142
-rwxr-xr-xcontrib/examples/git-merge-ours.sh14
-rwxr-xr-xcontrib/examples/git-merge.sh620
-rwxr-xr-xcontrib/examples/git-notes.sh121
-rwxr-xr-xcontrib/examples/git-remote.perl474
-rwxr-xr-xcontrib/examples/git-rerere.perl284
-rwxr-xr-xcontrib/examples/git-reset.sh106
-rwxr-xr-xcontrib/examples/git-resolve.sh112
-rwxr-xr-xcontrib/examples/git-revert.sh196
-rwxr-xr-xcontrib/examples/git-svnimport.perl976
-rw-r--r--contrib/examples/git-svnimport.txt179
-rwxr-xr-xcontrib/examples/git-tag.sh205
-rwxr-xr-xcontrib/examples/git-verify-tag.sh45
-rwxr-xr-xcontrib/fast-import/git-import.perl64
-rwxr-xr-xcontrib/fast-import/git-import.sh38
-rwxr-xr-xcontrib/fast-import/git-p41924
-rw-r--r--contrib/fast-import/git-p4.bat1
-rw-r--r--contrib/fast-import/git-p4.txt210
-rwxr-xr-xcontrib/fast-import/import-directories.perl416
-rwxr-xr-xcontrib/fast-import/import-tars.perl189
-rwxr-xr-xcontrib/fast-import/import-zips.py73
-rwxr-xr-xcontrib/git-resurrect.sh181
-rwxr-xr-xcontrib/gitview/gitview1305
-rw-r--r--contrib/gitview/gitview.txt56
-rwxr-xr-xcontrib/hg-to-git/hg-to-git.py250
-rw-r--r--contrib/hg-to-git/hg-to-git.txt21
-rwxr-xr-xcontrib/hooks/post-receive-email726
-rw-r--r--contrib/hooks/pre-auto-gc-battery43
-rw-r--r--contrib/hooks/setgitperms.perl214
-rw-r--r--contrib/hooks/update-paranoid421
-rw-r--r--contrib/p4import/README1
-rw-r--r--contrib/p4import/git-p4import.py360
-rw-r--r--contrib/p4import/git-p4import.txt167
-rw-r--r--contrib/patches/docbook-xsl-manpages-charmap.patch21
-rwxr-xr-xcontrib/remotes2config.sh33
-rwxr-xr-xcontrib/rerere-train.sh52
-rwxr-xr-xcontrib/stats/git-common-hash26
-rwxr-xr-xcontrib/stats/mailmap.pl38
-rwxr-xr-xcontrib/stats/packinfo.pl212
-rw-r--r--contrib/svn-fe/.gitignore4
-rw-r--r--contrib/svn-fe/Makefile63
-rw-r--r--contrib/svn-fe/svn-fe.c16
-rw-r--r--contrib/svn-fe/svn-fe.txt67
-rw-r--r--contrib/thunderbird-patch-inline/README20
-rwxr-xr-xcontrib/thunderbird-patch-inline/appp.sh55
-rw-r--r--contrib/vim/README32
-rwxr-xr-xcontrib/workdir/git-new-workdir82
-rw-r--r--convert.c800
-rw-r--r--copy.c78
-rw-r--r--csum-file.c127
-rw-r--r--csum-file.h31
-rw-r--r--ctype.c26
-rw-r--r--daemon.c1165
-rw-r--r--date.c1027
-rw-r--r--decorate.c88
-rw-r--r--decorate.h18
-rw-r--r--delta.h104
-rw-r--r--diff-delta.c489
-rw-r--r--diff-lib.c541
-rw-r--r--diff-no-index.c274
-rw-r--r--diff.c4407
-rw-r--r--diff.h315
-rw-r--r--diffcore-break.c294
-rw-r--r--diffcore-delta.c233
-rw-r--r--diffcore-order.c124
-rw-r--r--diffcore-pickaxe.c138
-rw-r--r--diffcore-rename.c658
-rw-r--r--diffcore.h132
-rw-r--r--dir.c1073
-rw-r--r--dir.h104
-rw-r--r--editor.c52
-rw-r--r--entry.c237
-rw-r--r--environment.c194
-rw-r--r--exec_cmd.c168
-rw-r--r--exec_cmd.h13
-rw-r--r--fast-import.c3012
-rw-r--r--fetch-pack.h28
-rwxr-xr-xfixup-builtins16
-rw-r--r--fsck.c373
-rw-r--r--fsck.h33
-rwxr-xr-xgenerate-cmdlist.sh24
-rwxr-xr-xgit-add--interactive.perl1598
-rwxr-xr-xgit-am.sh825
-rwxr-xr-xgit-archimport.perl1133
-rwxr-xr-xgit-bisect.sh447
-rw-r--r--git-compat-util.h517
-rwxr-xr-xgit-cvsexportcommit.perl453
-rwxr-xr-xgit-cvsimport.perl1078
-rwxr-xr-xgit-cvsserver.perl3694
-rwxr-xr-xgit-difftool--helper.sh71
-rwxr-xr-xgit-difftool.perl116
-rwxr-xr-xgit-filter-branch.sh508
-rw-r--r--git-gui/.gitattributes3
-rw-r--r--git-gui/.gitignore8
-rwxr-xr-xgit-gui/GIT-VERSION-GEN80
-rw-r--r--git-gui/Makefile344
-rwxr-xr-xgit-gui/git-gui--askpass (renamed from git-gui--askpass)0
-rwxr-xr-xgit-gui/git-gui.sh (renamed from git-gui.sh)0
-rw-r--r--git-gui/lib/about.tcl (renamed from lib/about.tcl)0
-rw-r--r--git-gui/lib/blame.tcl (renamed from lib/blame.tcl)0
-rw-r--r--git-gui/lib/branch.tcl (renamed from lib/branch.tcl)0
-rw-r--r--git-gui/lib/branch_checkout.tcl (renamed from lib/branch_checkout.tcl)0
-rw-r--r--git-gui/lib/branch_create.tcl (renamed from lib/branch_create.tcl)0
-rw-r--r--git-gui/lib/branch_delete.tcl (renamed from lib/branch_delete.tcl)0
-rw-r--r--git-gui/lib/branch_rename.tcl (renamed from lib/branch_rename.tcl)0
-rw-r--r--git-gui/lib/browser.tcl (renamed from lib/browser.tcl)0
-rw-r--r--git-gui/lib/checkout_op.tcl (renamed from lib/checkout_op.tcl)0
-rw-r--r--git-gui/lib/choose_font.tcl (renamed from lib/choose_font.tcl)0
-rw-r--r--git-gui/lib/choose_repository.tcl (renamed from lib/choose_repository.tcl)0
-rw-r--r--git-gui/lib/choose_rev.tcl (renamed from lib/choose_rev.tcl)0
-rw-r--r--git-gui/lib/class.tcl (renamed from lib/class.tcl)0
-rw-r--r--git-gui/lib/commit.tcl (renamed from lib/commit.tcl)0
-rw-r--r--git-gui/lib/console.tcl (renamed from lib/console.tcl)0
-rw-r--r--git-gui/lib/database.tcl (renamed from lib/database.tcl)0
-rw-r--r--git-gui/lib/date.tcl (renamed from lib/date.tcl)0
-rw-r--r--git-gui/lib/diff.tcl (renamed from lib/diff.tcl)0
-rw-r--r--git-gui/lib/encoding.tcl (renamed from lib/encoding.tcl)0
-rw-r--r--git-gui/lib/error.tcl (renamed from lib/error.tcl)0
-rw-r--r--git-gui/lib/git-gui.ico (renamed from lib/git-gui.ico)bin3638 -> 3638 bytes
-rw-r--r--git-gui/lib/index.tcl (renamed from lib/index.tcl)0
-rw-r--r--git-gui/lib/logo.tcl (renamed from lib/logo.tcl)0
-rw-r--r--git-gui/lib/merge.tcl (renamed from lib/merge.tcl)0
-rw-r--r--git-gui/lib/mergetool.tcl (renamed from lib/mergetool.tcl)0
-rw-r--r--git-gui/lib/option.tcl (renamed from lib/option.tcl)0
-rw-r--r--git-gui/lib/remote.tcl (renamed from lib/remote.tcl)0
-rw-r--r--git-gui/lib/remote_add.tcl (renamed from lib/remote_add.tcl)0
-rw-r--r--git-gui/lib/remote_branch_delete.tcl (renamed from lib/remote_branch_delete.tcl)0
-rw-r--r--git-gui/lib/search.tcl (renamed from lib/search.tcl)0
-rw-r--r--git-gui/lib/shortcut.tcl (renamed from lib/shortcut.tcl)0
-rw-r--r--git-gui/lib/spellcheck.tcl (renamed from lib/spellcheck.tcl)0
-rw-r--r--git-gui/lib/sshkey.tcl (renamed from lib/sshkey.tcl)0
-rw-r--r--git-gui/lib/status_bar.tcl (renamed from lib/status_bar.tcl)0
-rw-r--r--git-gui/lib/themed.tcl (renamed from lib/themed.tcl)0
-rw-r--r--git-gui/lib/tools.tcl (renamed from lib/tools.tcl)0
-rw-r--r--git-gui/lib/tools_dlg.tcl (renamed from lib/tools_dlg.tcl)0
-rw-r--r--git-gui/lib/transport.tcl (renamed from lib/transport.tcl)0
-rw-r--r--git-gui/lib/win32.tcl (renamed from lib/win32.tcl)0
-rw-r--r--git-gui/lib/win32_shortcut.js (renamed from lib/win32_shortcut.js)0
-rw-r--r--git-gui/macosx/AppMain.tcl (renamed from macosx/AppMain.tcl)0
-rw-r--r--git-gui/macosx/Info.plist (renamed from macosx/Info.plist)0
-rw-r--r--git-gui/macosx/git-gui.icns (renamed from macosx/git-gui.icns)bin28866 -> 28866 bytes
-rw-r--r--git-gui/po/.gitignore (renamed from po/.gitignore)0
-rw-r--r--git-gui/po/README (renamed from po/README)0
-rw-r--r--git-gui/po/de.po (renamed from po/de.po)0
-rw-r--r--git-gui/po/el.po (renamed from po/el.po)0
-rw-r--r--git-gui/po/fr.po (renamed from po/fr.po)0
-rw-r--r--git-gui/po/git-gui.pot (renamed from po/git-gui.pot)0
-rw-r--r--git-gui/po/glossary/Makefile (renamed from po/glossary/Makefile)0
-rw-r--r--git-gui/po/glossary/de.po (renamed from po/glossary/de.po)0
-rw-r--r--git-gui/po/glossary/el.po (renamed from po/glossary/el.po)0
-rw-r--r--git-gui/po/glossary/fr.po (renamed from po/glossary/fr.po)0
-rw-r--r--git-gui/po/glossary/git-gui-glossary.pot (renamed from po/glossary/git-gui-glossary.pot)0
-rw-r--r--git-gui/po/glossary/git-gui-glossary.txt (renamed from po/glossary/git-gui-glossary.txt)0
-rw-r--r--git-gui/po/glossary/it.po (renamed from po/glossary/it.po)0
-rwxr-xr-xgit-gui/po/glossary/txt-to-pot.sh (renamed from po/glossary/txt-to-pot.sh)0
-rw-r--r--git-gui/po/glossary/zh_cn.po (renamed from po/glossary/zh_cn.po)0
-rw-r--r--git-gui/po/hu.po (renamed from po/hu.po)0
-rw-r--r--git-gui/po/it.po (renamed from po/it.po)0
-rw-r--r--git-gui/po/ja.po (renamed from po/ja.po)0
-rw-r--r--git-gui/po/nb.po (renamed from po/nb.po)0
-rw-r--r--git-gui/po/po2msg.sh (renamed from po/po2msg.sh)0
-rw-r--r--git-gui/po/ru.po (renamed from po/ru.po)0
-rw-r--r--git-gui/po/sv.po (renamed from po/sv.po)0
-rw-r--r--git-gui/po/zh_cn.po (renamed from po/zh_cn.po)0
-rw-r--r--git-gui/windows/git-gui.sh (renamed from windows/git-gui.sh)0
-rwxr-xr-xgit-instaweb.sh620
-rwxr-xr-xgit-lost-found.sh33
-rwxr-xr-xgit-merge-octopus.sh104
-rwxr-xr-xgit-merge-one-file.sh160
-rwxr-xr-xgit-merge-resolve.sh54
-rw-r--r--git-mergetool--lib.sh419
-rwxr-xr-xgit-mergetool.sh327
-rw-r--r--git-parse-remote.sh95
-rwxr-xr-xgit-pull.sh297
-rwxr-xr-xgit-quiltimport.sh138
-rwxr-xr-xgit-rebase--interactive.sh1025
-rwxr-xr-xgit-rebase.sh612
-rwxr-xr-xgit-relink.perl173
-rw-r--r--git-remote-testgit.py244
-rwxr-xr-xgit-repack.sh183
-rwxr-xr-xgit-request-pull.sh79
-rwxr-xr-xgit-send-email.perl1372
-rw-r--r--git-sh-setup.sh213
-rwxr-xr-xgit-stash.sh511
-rwxr-xr-xgit-submodule.sh907
-rwxr-xr-xgit-svn.perl6236
-rwxr-xr-xgit-web--browse.sh184
-rw-r--r--git.c568
-rw-r--r--git.spec.in321
-rw-r--r--git_remote_helpers/.gitignore2
-rw-r--r--git_remote_helpers/Makefile39
-rw-r--r--git_remote_helpers/__init__.py16
-rw-r--r--git_remote_helpers/git/__init__.py0
-rw-r--r--git_remote_helpers/git/exporter.py53
-rw-r--r--git_remote_helpers/git/git.py678
-rw-r--r--git_remote_helpers/git/importer.py40
-rw-r--r--git_remote_helpers/git/non_local.py69
-rw-r--r--git_remote_helpers/git/repo.py75
-rw-r--r--git_remote_helpers/setup.py17
-rw-r--r--git_remote_helpers/util.py194
-rw-r--r--gitk-git/Makefile67
-rw-r--r--gitk-git/gitk11631
-rw-r--r--gitk-git/po/.gitignore1
-rw-r--r--gitk-git/po/de.po1278
-rw-r--r--gitk-git/po/es.po911
-rw-r--r--gitk-git/po/fr.po1254
-rw-r--r--gitk-git/po/hu.po1295
-rw-r--r--gitk-git/po/it.po1276
-rw-r--r--gitk-git/po/ja.po1255
-rw-r--r--gitk-git/po/po2msg.sh133
-rw-r--r--gitk-git/po/ru.po1085
-rw-r--r--gitk-git/po/sv.po1297
-rw-r--r--gitweb/INSTALL273
-rw-r--r--gitweb/Makefile160
-rw-r--r--gitweb/README498
-rwxr-xr-xgitweb/gitweb.perl7029
-rw-r--r--gitweb/static/git-favicon.pngbin0 -> 115 bytes
-rw-r--r--gitweb/static/git-logo.pngbin0 -> 207 bytes
-rw-r--r--gitweb/static/gitweb.css592
-rw-r--r--gitweb/static/gitweb.js875
-rw-r--r--graph.c1370
-rw-r--r--graph.h108
-rw-r--r--grep.c1009
-rw-r--r--grep.h118
-rw-r--r--hash.c110
-rw-r--r--hash.h43
-rw-r--r--help.c370
-rw-r--r--help.h32
-rw-r--r--hex.c67
-rw-r--r--http-backend.c607
-rw-r--r--http-fetch.c99
-rw-r--r--http-push.c2106
-rw-r--r--http-walker.c593
-rw-r--r--http.c1390
-rw-r--r--http.h193
-rw-r--r--ident.c270
-rw-r--r--imap-send.c1601
-rw-r--r--levenshtein.c84
-rw-r--r--levenshtein.h8
-rw-r--r--list-objects.c184
-rw-r--r--list-objects.h12
-rw-r--r--ll-merge.c382
-rw-r--r--ll-merge.h32
-rw-r--r--lockfile.c280
-rw-r--r--log-tree.c667
-rw-r--r--log-tree.h27
-rw-r--r--mailmap.c245
-rw-r--r--mailmap.h10
-rw-r--r--match-trees.c370
-rw-r--r--merge-file.c123
-rw-r--r--merge-recursive.c1546
-rw-r--r--merge-recursive.h58
-rw-r--r--name-hash.c119
-rw-r--r--notes-cache.c94
-rw-r--r--notes-cache.h20
-rw-r--r--notes.c1199
-rw-r--r--notes.h271
-rw-r--r--object.c270
-rw-r--r--object.h84
-rw-r--r--pack-check.c172
-rw-r--r--pack-refs.c149
-rw-r--r--pack-refs.h18
-rw-r--r--pack-revindex.c156
-rw-r--r--pack-revindex.h12
-rw-r--r--pack-write.c282
-rw-r--r--pack.h70
-rw-r--r--pager.c118
-rw-r--r--parse-options.c688
-rw-r--r--parse-options.h216
-rw-r--r--patch-delta.c86
-rw-r--r--patch-ids.c109
-rw-r--r--patch-ids.h21
-rw-r--r--path.c777
-rw-r--r--perl/.gitignore5
-rw-r--r--perl/Git.pm1362
-rw-r--r--perl/Makefile47
-rw-r--r--perl/Makefile.PL38
-rw-r--r--perl/private-Error.pm827
-rw-r--r--pkt-line.c169
-rw-r--r--pkt-line.h19
-rw-r--r--ppc/sha1.c72
-rw-r--r--ppc/sha1.h25
-rw-r--r--ppc/sha1ppc.S224
-rw-r--r--preload-index.c106
-rw-r--r--pretty.c1255
-rw-r--r--progress.c269
-rw-r--r--progress.h14
-rw-r--r--quote.c513
-rw-r--r--quote.h70
-rw-r--r--reachable.c226
-rw-r--r--reachable.h6
-rw-r--r--read-cache.c1679
-rw-r--r--reflog-walk.c315
-rw-r--r--reflog-walk.h22
-rw-r--r--refs.c1946
-rw-r--r--refs.h117
-rw-r--r--remote-curl.c862
-rw-r--r--remote.c1718
-rw-r--r--remote.h169
-rw-r--r--replace_object.c114
-rw-r--r--rerere.c616
-rw-r--r--rerere.h18
-rw-r--r--resolve-undo.c172
-rw-r--r--resolve-undo.h16
-rw-r--r--revision.c2235
-rw-r--r--revision.h196
-rw-r--r--run-command.c641
-rw-r--r--run-command.h93
-rw-r--r--send-pack.h20
-rw-r--r--server-info.c249
-rw-r--r--setup.c619
-rw-r--r--sha1-lookup.c272
-rw-r--r--sha1-lookup.h16
-rw-r--r--sha1_file.c2546
-rw-r--r--sha1_name.c1142
-rw-r--r--shallow.c104
-rw-r--r--shell.c103
-rw-r--r--shortlog.h28
-rw-r--r--show-index.c84
-rw-r--r--sideband.c151
-rw-r--r--sideband.h13
-rw-r--r--sigchain.c52
-rw-r--r--sigchain.h11
-rw-r--r--strbuf.c404
-rw-r--r--strbuf.h139
-rw-r--r--string-list.c186
-rw-r--r--string-list.h48
-rw-r--r--submodule.c459
-rw-r--r--submodule.h19
-rw-r--r--symlinks.c281
-rw-r--r--t/.gitattributes1
-rw-r--r--t/.gitignore3
-rw-r--r--t/Makefile90
-rw-r--r--t/README702
-rwxr-xr-xt/aggregate-results.sh34
-rw-r--r--t/annotate-tests.sh126
-rw-r--r--t/diff-lib.sh39
-rw-r--r--t/gitweb-lib.sh88
-rwxr-xr-xt/harness21
-rw-r--r--t/lib-cvs.sh78
-rw-r--r--t/lib-git-svn.sh171
-rw-r--r--t/lib-httpd.sh161
-rw-r--r--t/lib-httpd/apache.conf68
-rw-r--r--t/lib-httpd/ssl.cnf8
-rw-r--r--t/lib-pager.sh15
-rw-r--r--t/lib-patch-mode.sh38
-rw-r--r--t/lib-prereq-FILEMODE.sh11
-rw-r--r--t/lib-read-tree-m-3way.sh158
-rw-r--r--t/lib-rebase.sh67
-rw-r--r--t/lib-t6000.sh127
-rwxr-xr-xt/t0000-basic.sh441
-rwxr-xr-xt/t0001-init.sh321
-rwxr-xr-xt/t0002-gitfile.sh103
-rwxr-xr-xt/t0003-attributes.sh124
-rwxr-xr-xt/t0004-unwritable.sh68
-rwxr-xr-xt/t0005-signals.sh23
-rwxr-xr-xt/t0006-date.sh78
-rwxr-xr-xt/t0010-racy-git.sh33
-rwxr-xr-xt/t0020-crlf.sh509
-rwxr-xr-xt/t0021-conversion.sh96
-rwxr-xr-xt/t0022-crlf-rename.sh33
-rwxr-xr-xt/t0023-crlf-am.sh44
-rwxr-xr-xt/t0024-crlf-archive.sh46
-rwxr-xr-xt/t0025-crlf-auto.sh155
-rwxr-xr-xt/t0026-eol-config.sh83
-rwxr-xr-xt/t0030-stripspace.sh400
-rwxr-xr-xt/t0040-parse-options.sh340
-rwxr-xr-xt/t0050-filesystem.sh155
-rwxr-xr-xt/t0055-beyond-symlinks.sh25
-rwxr-xr-xt/t0060-path-utils.sh142
-rwxr-xr-xt/t0061-run-command.sh14
-rwxr-xr-xt/t0070-fundamental.sh15
-rwxr-xr-xt/t0080-vcs-svn.sh171
-rwxr-xr-xt/t0100-previous.sh49
-rwxr-xr-xt/t0101-at-syntax.sh45
-rwxr-xr-xt/t1000-read-tree-m-3way.sh528
-rwxr-xr-xt/t1001-read-tree-m-2way.sh409
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh344
-rwxr-xr-xt/t1003-read-tree-prefix.sh27
-rwxr-xr-xt/t1004-read-tree-m-u-wf.sh241
-rwxr-xr-xt/t1005-read-tree-reset.sh90
-rwxr-xr-xt/t1006-cat-file.sh244
-rwxr-xr-xt/t1007-hash-object.sh191
-rwxr-xr-xt/t1008-read-tree-overlay.sh31
-rwxr-xr-xt/t1009-read-tree-new-index.sh25
-rwxr-xr-xt/t1010-mktree.sh69
-rwxr-xr-xt/t1011-read-tree-sparse-checkout.sh179
-rwxr-xr-xt/t1012-read-tree-df.sh102
-rwxr-xr-xt/t1020-subdirectory.sh138
-rwxr-xr-xt/t1100-commit-tree-options.sh45
-rwxr-xr-xt/t1200-tutorial.sh265
-rwxr-xr-xt/t1300-repo-config.sh857
-rwxr-xr-xt/t1301-shared-repo.sh170
-rwxr-xr-xt/t1302-repo-version.sh47
-rwxr-xr-xt/t1303-wacky-config.sh50
-rwxr-xr-xt/t1304-default-acl.sh61
-rwxr-xr-xt/t1400-update-ref.sh288
-rwxr-xr-xt/t1401-symbolic-ref.sh36
-rwxr-xr-xt/t1402-check-ref-format.sh78
-rwxr-xr-xt/t1410-reflog.sh258
-rwxr-xr-xt/t1411-reflog-show.sh76
-rwxr-xr-xt/t1420-lost-found.sh35
-rwxr-xr-xt/t1450-fsck.sh134
-rwxr-xr-xt/t1500-rev-parse.sh87
-rwxr-xr-xt/t1501-worktree.sh343
-rwxr-xr-xt/t1502-rev-parse-parseopt.sh102
-rwxr-xr-xt/t1503-rev-parse-verify.sh118
-rwxr-xr-xt/t1504-ceiling-dirs.sh163
-rwxr-xr-xt/t1505-rev-parse-last.sh69
-rwxr-xr-xt/t1506-rev-parse-diagnosis.sh78
-rwxr-xr-xt/t1507-rev-parse-upstream.sh139
-rwxr-xr-xt/t1508-at-combinations.sh51
-rwxr-xr-xt/t1509-root-worktree.sh249
-rw-r--r--t/t1509/excludes14
-rwxr-xr-xt/t1509/prepare-chroot.sh38
-rwxr-xr-xt/t2000-checkout-cache-clash.sh60
-rwxr-xr-xt/t2001-checkout-cache-clash.sh86
-rwxr-xr-xt/t2002-checkout-cache-u.sh33
-rwxr-xr-xt/t2003-checkout-cache-mkdir.sh96
-rwxr-xr-xt/t2004-checkout-cache-temp.sh212
-rwxr-xr-xt/t2005-checkout-index-symlinks.sh28
-rwxr-xr-xt/t2007-checkout-symlink.sh52
-rwxr-xr-xt/t2008-checkout-subdir.sh82
-rwxr-xr-xt/t2009-checkout-statinfo.sh52
-rwxr-xr-xt/t2010-checkout-ambiguous.sh50
-rwxr-xr-xt/t2011-checkout-invalid-head.sh22
-rwxr-xr-xt/t2012-checkout-last.sh119
-rwxr-xr-xt/t2013-checkout-submodule.sh65
-rwxr-xr-xt/t2014-switch.sh28
-rwxr-xr-xt/t2015-checkout-unborn.sh40
-rwxr-xr-xt/t2016-checkout-patch.sh115
-rwxr-xr-xt/t2017-checkout-orphan.sh119
-rwxr-xr-xt/t2018-checkout-branch.sh172
-rwxr-xr-xt/t2030-unresolve-info.sh170
-rwxr-xr-xt/t2050-git-dir-relative.sh55
-rwxr-xr-xt/t2100-update-cache-badpath.sh61
-rwxr-xr-xt/t2101-update-index-reupdate.sh84
-rwxr-xr-xt/t2102-update-index-symlinks.sh31
-rwxr-xr-xt/t2103-update-index-ignore-missing.sh89
-rwxr-xr-xt/t2104-update-index-skip-worktree.sh57
-rwxr-xr-xt/t2105-update-index-gitfile.sh38
-rwxr-xr-xt/t2106-update-index-assume-unchanged.sh24
-rwxr-xr-xt/t2200-add-update.sh184
-rwxr-xr-xt/t2201-add-update-typechange.sh150
-rwxr-xr-xt/t2202-add-addremove.sh44
-rwxr-xr-xt/t2203-add-intent.sh64
-rwxr-xr-xt/t2204-add-ignored.sh79
-rwxr-xr-xt/t2300-cd-to-toplevel.sh37
-rwxr-xr-xt/t3000-ls-files-others.sh68
-rwxr-xr-xt/t3001-ls-files-others-exclude.sh217
-rwxr-xr-xt/t3002-ls-files-dashpath.sh69
-rwxr-xr-xt/t3003-ls-files-exclude.sh40
-rwxr-xr-xt/t3010-ls-files-killed-modified.sh107
-rwxr-xr-xt/t3020-ls-files-error-unmatch.sh29
-rwxr-xr-xt/t3030-merge-recursive.sh583
-rwxr-xr-xt/t3031-merge-criscross.sh95
-rwxr-xr-xt/t3040-subprojects-basic.sh85
-rwxr-xr-xt/t3050-subprojects-fetch.sh52
-rwxr-xr-xt/t3060-ls-files-with-tree.sh71
-rwxr-xr-xt/t3100-ls-tree-restrict.sh168
-rwxr-xr-xt/t3101-ls-tree-dirname.sh229
-rwxr-xr-xt/t3200-branch.sh518
-rwxr-xr-xt/t3201-branch-contains.sh98
-rwxr-xr-xt/t3202-show-branch-octopus.sh67
-rwxr-xr-xt/t3203-branch-output.sh81
-rwxr-xr-xt/t3210-pack-refs.sh121
-rwxr-xr-xt/t3300-funny-names.sh198
-rwxr-xr-xt/t3301-notes.sh1064
-rwxr-xr-xt/t3302-notes-index-expensive.sh126
-rwxr-xr-xt/t3303-notes-subtrees.sh194
-rwxr-xr-xt/t3304-notes-mixed.sh206
-rwxr-xr-xt/t3305-notes-fanout.sh95
-rwxr-xr-xt/t3306-notes-prune.sh138
-rwxr-xr-xt/t3307-notes-man.sh38
-rwxr-xr-xt/t3400-rebase.sh212
-rwxr-xr-xt/t3401-rebase-partial.sh61
-rwxr-xr-xt/t3402-rebase-merge.sh120
-rwxr-xr-xt/t3403-rebase-skip.sh73
-rwxr-xr-xt/t3404-rebase-interactive.sh719
-rwxr-xr-xt/t3405-rebase-malformed.sh48
-rwxr-xr-xt/t3406-rebase-message.sh65
-rwxr-xr-xt/t3407-rebase-abort.sh80
-rwxr-xr-xt/t3408-rebase-multi-line.sh41
-rwxr-xr-xt/t3409-rebase-preserve-merges.sh95
-rwxr-xr-xt/t3410-rebase-preserve-dropped-merges.sh85
-rwxr-xr-xt/t3411-rebase-preserve-around-merges.sh74
-rwxr-xr-xt/t3412-rebase-root.sh280
-rwxr-xr-xt/t3413-rebase-hook.sh146
-rwxr-xr-xt/t3414-rebase-preserve-onto.sh80
-rwxr-xr-xt/t3415-rebase-autosquash.sh97
-rwxr-xr-xt/t3416-rebase-onto-threedots.sh105
-rwxr-xr-xt/t3417-rebase-whitespace-fix.sh126
-rwxr-xr-xt/t3418-rebase-continue.sh43
-rwxr-xr-xt/t3500-cherry.sh58
-rwxr-xr-xt/t3501-revert-cherry-pick.sh93
-rwxr-xr-xt/t3502-cherry-pick-merge.sh123
-rwxr-xr-xt/t3503-cherry-pick-root.sh30
-rwxr-xr-xt/t3504-cherry-pick-rerere.sh45
-rwxr-xr-xt/t3505-cherry-pick-empty.sh51
-rwxr-xr-xt/t3506-cherry-pick-ff.sh98
-rwxr-xr-xt/t3507-cherry-pick-conflict.sh218
-rwxr-xr-xt/t3508-cherry-pick-many-commits.sh159
-rwxr-xr-xt/t3509-cherry-pick-merge-df.sh35
-rwxr-xr-xt/t3600-rm.sh266
-rwxr-xr-xt/t3700-add.sh291
-rwxr-xr-xt/t3701-add-interactive.sh298
-rwxr-xr-xt/t3702-add-edit.sh121
-rwxr-xr-xt/t3800-mktag.sh365
-rwxr-xr-xt/t3900-i18n-commit.sh136
-rw-r--r--t/t3900/1-UTF-8.txt3
-rw-r--r--t/t3900/2-UTF-8.txt4
-rw-r--r--t/t3900/ISO-2022-JP.txt4
-rw-r--r--t/t3900/ISO8859-1.txt3
-rw-r--r--t/t3900/eucJP.txt4
-rwxr-xr-xt/t3901-8859-1.txt4
-rwxr-xr-xt/t3901-i18n-patch.sh255
-rwxr-xr-xt/t3901-utf8.txt4
-rwxr-xr-xt/t3902-quoted.sh154
-rwxr-xr-xt/t3903-stash.sh493
-rwxr-xr-xt/t3904-stash-patch.sh55
-rwxr-xr-xt/t4000-diff-format.sh62
-rwxr-xr-xt/t4001-diff-rename.sh80
-rwxr-xr-xt/t4002-diff-basic.sh269
-rwxr-xr-xt/t4003-diff-rename-1.sh128
-rwxr-xr-xt/t4004-diff-rename-symlink.sh69
-rwxr-xr-xt/t4005-diff-rename-2.sh86
-rwxr-xr-xt/t4006-diff-mode.sh30
-rwxr-xr-xt/t4007-rename-3.sh90
-rwxr-xr-xt/t4008-diff-break-rewrite.sh188
-rwxr-xr-xt/t4009-diff-rename-4.sh95
-rwxr-xr-xt/t4010-diff-pathspec.sh73
-rwxr-xr-xt/t4011-diff-symlink.sh91
-rwxr-xr-xt/t4012-diff-binary.sh97
-rwxr-xr-xt/t4013-diff-various.sh290
-rw-r--r--t/t4013/diff.config_format.subjectprefix_DIFFERENT_PREFIX2
-rw-r--r--t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master34
-rw-r--r--t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side39
-rw-r--r--t/t4013/diff.diff-tree_--cc_--patch-with-stat_master34
-rw-r--r--t/t4013/diff.diff-tree_--cc_--stat_--summary_master6
-rw-r--r--t/t4013/diff.diff-tree_--cc_--stat_--summary_side8
-rw-r--r--t/t4013/diff.diff-tree_--cc_--stat_master6
-rw-r--r--t/t4013/diff.diff-tree_--cc_master30
-rw-r--r--t/t4013/diff.diff-tree_--patch-with-raw_initial2
-rw-r--r--t/t4013/diff.diff-tree_--patch-with-stat_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-raw_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_--patch-with-stat_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial33
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial34
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial29
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_--root_initial6
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_-p_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty=oneline_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--patch-with-stat_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side43
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_--patch-with-raw_initial38
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial39
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial15
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_--stat_initial12
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial11
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_--summary_initial11
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_-p_initial34
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--root_initial11
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--stat_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_--summary_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_-p_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_-p_side38
-rw-r--r--t/t4013/diff.diff-tree_--pretty_initial2
-rw-r--r--t/t4013/diff.diff-tree_--pretty_side11
-rw-r--r--t/t4013/diff.diff-tree_--root_--abbrev_initial6
-rw-r--r--t/t4013/diff.diff-tree_--root_--patch-with-raw_initial33
-rw-r--r--t/t4013/diff.diff-tree_--root_--patch-with-stat_initial34
-rw-r--r--t/t4013/diff.diff-tree_--root_-p_initial29
-rw-r--r--t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial6
-rw-r--r--t/t4013/diff.diff-tree_--root_-r_--abbrev_initial6
-rw-r--r--t/t4013/diff.diff-tree_--root_-r_initial6
-rw-r--r--t/t4013/diff.diff-tree_--root_initial6
-rw-r--r--t/t4013/diff.diff-tree_-c_--abbrev_master5
-rw-r--r--t/t4013/diff.diff-tree_-c_--stat_--summary_master6
-rw-r--r--t/t4013/diff.diff-tree_-c_--stat_--summary_side8
-rw-r--r--t/t4013/diff.diff-tree_-c_--stat_master6
-rw-r--r--t/t4013/diff.diff-tree_-c_master5
-rw-r--r--t/t4013/diff.diff-tree_-p_-m_master80
-rw-r--r--t/t4013/diff.diff-tree_-p_initial2
-rw-r--r--t/t4013/diff.diff-tree_-p_master2
-rw-r--r--t/t4013/diff.diff-tree_-r_--abbrev=4_initial2
-rw-r--r--t/t4013/diff.diff-tree_-r_--abbrev_initial2
-rw-r--r--t/t4013/diff.diff-tree_-r_initial2
-rw-r--r--t/t4013/diff.diff-tree_initial2
-rw-r--r--t/t4013/diff.diff-tree_master2
-rw-r--r--t/t4013/diff.diff_--abbrev_initial..side32
-rw-r--r--t/t4013/diff.diff_--dirstat_master~1_master~23
-rw-r--r--t/t4013/diff.diff_--name-status_dir2_dir2
-rw-r--r--t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir3
-rw-r--r--t/t4013/diff.diff_--no-index_--name-status_dir2_dir3
-rw-r--r--t/t4013/diff.diff_--no-index_dir_dir32
-rw-r--r--t/t4013/diff.diff_--patch-with-raw_-r_initial..side36
-rw-r--r--t/t4013/diff.diff_--patch-with-raw_initial..side36
-rw-r--r--t/t4013/diff.diff_--patch-with-stat_-r_initial..side37
-rw-r--r--t/t4013/diff.diff_--patch-with-stat_initial..side37
-rw-r--r--t/t4013/diff.diff_--stat_initial..side6
-rw-r--r--t/t4013/diff.diff_-r_--stat_initial..side6
-rw-r--r--t/t4013/diff.diff_-r_initial..side32
-rw-r--r--t/t4013/diff.diff_initial..side32
-rw-r--r--t/t4013/diff.diff_master_master^_side29
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side61
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_initial..master170
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_initial..master^110
-rw-r--r--t/t4013/diff.format-patch_--attach_--stdout_initial..side61
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master170
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master170
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..master170
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..master^110
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..master^^62
-rw-r--r--t/t4013/diff.format-patch_--inline_--stdout_initial..side61
-rw-r--r--t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^103
-rw-r--r--t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master127
-rw-r--r--t/t4013/diff.format-patch_--stdout_--numbered_initial..master127
-rw-r--r--t/t4013/diff.format-patch_--stdout_initial..master127
-rw-r--r--t/t4013/diff.format-patch_--stdout_initial..master^81
-rw-r--r--t/t4013/diff.format-patch_--stdout_initial..side47
-rw-r--r--t/t4013/diff.log_--decorate=full_--all34
-rw-r--r--t/t4013/diff.log_--decorate_--all34
-rw-r--r--t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_74
-rw-r--r--t/t4013/diff.log_--patch-with-stat_master129
-rw-r--r--t/t4013/diff.log_--patch-with-stat_master_--_dir_74
-rw-r--r--t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master199
-rw-r--r--t/t4013/diff.log_--root_--patch-with-stat_--summary_master167
-rw-r--r--t/t4013/diff.log_--root_--patch-with-stat_master161
-rw-r--r--t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master199
-rw-r--r--t/t4013/diff.log_--root_-p_master142
-rw-r--r--t/t4013/diff.log_--root_master34
-rw-r--r--t/t4013/diff.log_-SF_-p_master18
-rw-r--r--t/t4013/diff.log_-SF_master7
-rw-r--r--t/t4013/diff.log_-S_F_master7
-rw-r--r--t/t4013/diff.log_-m_-p_--first-parent_master100
-rw-r--r--t/t4013/diff.log_-m_-p_master200
-rw-r--r--t/t4013/diff.log_-p_--first-parent_master78
-rw-r--r--t/t4013/diff.log_-p_master115
-rw-r--r--t/t4013/diff.log_master34
-rw-r--r--t/t4013/diff.rev-list_--children_HEAD7
-rw-r--r--t/t4013/diff.rev-list_--parents_HEAD7
-rw-r--r--t/t4013/diff.show_--first-parent_master30
-rw-r--r--t/t4013/diff.show_--patch-with-raw_side42
-rw-r--r--t/t4013/diff.show_--patch-with-stat_--summary_side44
-rw-r--r--t/t4013/diff.show_--patch-with-stat_side43
-rw-r--r--t/t4013/diff.show_--root_initial34
-rw-r--r--t/t4013/diff.show_--stat_--summary_side13
-rw-r--r--t/t4013/diff.show_--stat_side12
-rw-r--r--t/t4013/diff.show_-c_master36
-rw-r--r--t/t4013/diff.show_-m_master93
-rw-r--r--t/t4013/diff.show_initial7
-rw-r--r--t/t4013/diff.show_master36
-rw-r--r--t/t4013/diff.show_side38
-rw-r--r--t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_61
-rw-r--r--t/t4013/diff.whatchanged_--patch-with-stat_master116
-rw-r--r--t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_61
-rw-r--r--t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master199
-rw-r--r--t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master160
-rw-r--r--t/t4013/diff.whatchanged_--root_--patch-with-stat_master154
-rw-r--r--t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master199
-rw-r--r--t/t4013/diff.whatchanged_--root_-p_master135
-rw-r--r--t/t4013/diff.whatchanged_--root_master42
-rw-r--r--t/t4013/diff.whatchanged_-SF_-p_master18
-rw-r--r--t/t4013/diff.whatchanged_-SF_master9
-rw-r--r--t/t4013/diff.whatchanged_-p_master102
-rw-r--r--t/t4013/diff.whatchanged_master32
-rwxr-xr-xt/t4014-format-patch.sh668
-rwxr-xr-xt/t4015-diff-whitespace.sh494
-rwxr-xr-xt/t4016-diff-quote.sh78
-rwxr-xr-xt/t4017-diff-retval.sh166
-rwxr-xr-xt/t4018-diff-funcname.sh89
-rwxr-xr-xt/t4019-diff-wserror.sh202
-rwxr-xr-xt/t4020-diff-external.sh172
-rw-r--r--t/t4020/diff.NULbin0 -> 116 bytes
-rwxr-xr-xt/t4021-format-patch-numbered.sh124
-rwxr-xr-xt/t4022-diff-rewrite.sh29
-rwxr-xr-xt/t4023-diff-rename-typechange.sh86
-rwxr-xr-xt/t4024-diff-optimize-common.sh157
-rwxr-xr-xt/t4025-hunk-header.sh44
-rwxr-xr-xt/t4026-color.sh93
-rwxr-xr-xt/t4027-diff-submodule.sh355
-rwxr-xr-xt/t4028-format-patch-mime-headers.sh30
-rwxr-xr-xt/t4029-diff-trailing-space.sh39
-rwxr-xr-xt/t4030-diff-textconv.sh126
-rwxr-xr-xt/t4031-diff-rewrite-binary.sh67
-rwxr-xr-xt/t4032-diff-inter-hunk-context.sh92
-rwxr-xr-xt/t4033-diff-patience.sh168
-rwxr-xr-xt/t4034-diff-words.sh334
-rwxr-xr-xt/t4035-diff-quiet.sh80
-rwxr-xr-xt/t4036-format-patch-signer-mime.sh50
-rwxr-xr-xt/t4037-diff-r-t-dirs.sh53
-rwxr-xr-xt/t4038-diff-combined.sh92
-rwxr-xr-xt/t4039-diff-assume-unchanged.sh31
-rwxr-xr-xt/t4040-whitespace-status.sh63
-rwxr-xr-xt/t4041-diff-submodule-option.sh428
-rwxr-xr-xt/t4042-diff-textconv-caching.sh109
-rwxr-xr-xt/t4043-diff-rename-binary.sh45
-rwxr-xr-xt/t4044-diff-index-unique-abbrev.sh35
-rwxr-xr-xt/t4045-diff-relative.sh61
-rwxr-xr-xt/t4100-apply-stat.sh40
-rw-r--r--t/t4100/t-apply-1.expect11
-rw-r--r--t/t4100/t-apply-1.patch194
-rw-r--r--t/t4100/t-apply-2.expect5
-rw-r--r--t/t4100/t-apply-2.patch72
-rw-r--r--t/t4100/t-apply-3.expect7
-rw-r--r--t/t4100/t-apply-3.patch567
-rw-r--r--t/t4100/t-apply-4.expect5
-rw-r--r--t/t4100/t-apply-4.patch7
-rw-r--r--t/t4100/t-apply-5.expect19
-rw-r--r--t/t4100/t-apply-5.patch612
-rw-r--r--t/t4100/t-apply-6.expect5
-rw-r--r--t/t4100/t-apply-6.patch101
-rw-r--r--t/t4100/t-apply-7.expect6
-rw-r--r--t/t4100/t-apply-7.patch494
-rw-r--r--t/t4100/t-apply-8.expect2
-rw-r--r--t/t4100/t-apply-8.patch11
-rw-r--r--t/t4100/t-apply-9.expect2
-rw-r--r--t/t4100/t-apply-9.patch11
-rwxr-xr-xt/t4101-apply-nonl.sh31
-rw-r--r--t/t4101/diff.0-16
-rw-r--r--t/t4101/diff.0-27
-rw-r--r--t/t4101/diff.0-38
-rw-r--r--t/t4101/diff.1-06
-rw-r--r--t/t4101/diff.1-28
-rw-r--r--t/t4101/diff.1-38
-rw-r--r--t/t4101/diff.2-07
-rw-r--r--t/t4101/diff.2-18
-rw-r--r--t/t4101/diff.2-37
-rw-r--r--t/t4101/diff.3-08
-rw-r--r--t/t4101/diff.3-18
-rw-r--r--t/t4101/diff.3-27
-rwxr-xr-xt/t4102-apply-rename.sh58
-rwxr-xr-xt/t4103-apply-binary.sh121
-rwxr-xr-xt/t4104-apply-boundary.sh146
-rwxr-xr-xt/t4105-apply-fuzz.sh57
-rwxr-xr-xt/t4106-apply-stdin.sh26
-rwxr-xr-xt/t4107-apply-ignore-whitespace.sh185
-rwxr-xr-xt/t4109-apply-multifrag.sh35
-rw-r--r--t/t4109/expect-131
-rw-r--r--t/t4109/expect-223
-rw-r--r--t/t4109/expect-324
-rw-r--r--t/t4109/patch1.patch28
-rw-r--r--t/t4109/patch2.patch30
-rw-r--r--t/t4109/patch3.patch31
-rw-r--r--t/t4109/patch4.patch30
-rwxr-xr-xt/t4110-apply-scan.sh22
-rw-r--r--t/t4110/expect20
-rw-r--r--t/t4110/patch1.patch17
-rw-r--r--t/t4110/patch2.patch11
-rw-r--r--t/t4110/patch3.patch14
-rw-r--r--t/t4110/patch4.patch11
-rw-r--r--t/t4110/patch5.patch11
-rwxr-xr-xt/t4111-apply-subdir.sh142
-rwxr-xr-xt/t4112-apply-renames.sh144
-rwxr-xr-xt/t4113-apply-ending.sh53
-rwxr-xr-xt/t4114-apply-typechange.sh123
-rwxr-xr-xt/t4115-apply-symlink.sh49
-rwxr-xr-xt/t4116-apply-reverse.sh91
-rwxr-xr-xt/t4117-apply-reject.sh157
-rwxr-xr-xt/t4118-apply-empty-context.sh55
-rwxr-xr-xt/t4119-apply-config.sh162
-rwxr-xr-xt/t4120-apply-popt.sh59
-rwxr-xr-xt/t4121-apply-diffs.sh32
-rwxr-xr-xt/t4122-apply-symlink-inside.sh55
-rwxr-xr-xt/t4123-apply-shrink.sh58
-rwxr-xr-xt/t4124-apply-ws-rule.sh451
-rwxr-xr-xt/t4125-apply-ws-fuzz.sh103
-rwxr-xr-xt/t4126-apply-empty.sh57
-rwxr-xr-xt/t4127-apply-same-fn.sh90
-rwxr-xr-xt/t4128-apply-root.sh112
-rwxr-xr-xt/t4129-apply-samemode.sh63
-rwxr-xr-xt/t4130-apply-criss-cross-rename.sh66
-rwxr-xr-xt/t4131-apply-fake-ancestor.sh42
-rwxr-xr-xt/t4132-apply-removal.sh95
-rwxr-xr-xt/t4133-apply-filenames.sh38
-rwxr-xr-xt/t4134-apply-submodule.sh38
-rwxr-xr-xt/t4135-apply-weird-filenames.sh75
-rw-r--r--t/t4135/.gitignore3
-rw-r--r--t/t4135/add-plain.diff5
-rw-r--r--t/t4135/add-with backslash.diff5
-rw-r--r--t/t4135/add-with quote.diff5
-rw-r--r--t/t4135/add-with spaces.diff5
-rw-r--r--t/t4135/add-with tab.diff5
-rw-r--r--t/t4135/damaged.diff5
-rw-r--r--t/t4135/diff-plain.diff5
-rw-r--r--t/t4135/diff-with backslash.diff5
-rw-r--r--t/t4135/diff-with quote.diff5
-rw-r--r--t/t4135/diff-with spaces.diff5
-rw-r--r--t/t4135/diff-with tab.diff5
-rw-r--r--t/t4135/git-plain.diff7
-rw-r--r--t/t4135/git-with backslash.diff7
-rw-r--r--t/t4135/git-with quote.diff7
-rw-r--r--t/t4135/git-with spaces.diff7
-rw-r--r--t/t4135/git-with tab.diff7
-rwxr-xr-xt/t4135/make-patches45
-rwxr-xr-xt/t4150-am.sh480
-rwxr-xr-xt/t4151-am-abort.sh65
-rwxr-xr-xt/t4200-rerere.sh394
-rwxr-xr-xt/t4201-shortlog.sh151
-rwxr-xr-xt/t4202-log.sh457
-rwxr-xr-xt/t4203-mailmap.sh215
-rwxr-xr-xt/t4204-patch-id.sh66
-rwxr-xr-xt/t4205-log-pretty-formats.sh74
-rwxr-xr-xt/t4206-log-follow-harder-copies.sh56
-rwxr-xr-xt/t4207-log-decoration-colors.sh66
-rwxr-xr-xt/t4252-am-options.sh78
-rw-r--r--t/t4252/am-test-1-119
-rw-r--r--t/t4252/am-test-1-221
-rw-r--r--t/t4252/am-test-2-119
-rw-r--r--t/t4252/am-test-2-221
-rw-r--r--t/t4252/am-test-3-119
-rw-r--r--t/t4252/am-test-3-221
-rw-r--r--t/t4252/am-test-4-119
-rw-r--r--t/t4252/am-test-4-222
-rw-r--r--t/t4252/am-test-5-120
-rw-r--r--t/t4252/am-test-5-215
-rw-r--r--t/t4252/am-test-6-121
-rw-r--r--t/t4252/file-1-07
-rw-r--r--t/t4252/file-2-07
-rwxr-xr-xt/t4253-am-keep-cr-dos.sh96
-rwxr-xr-xt/t4300-merge-tree.sh257
-rwxr-xr-xt/t5000-tar-tree.sh255
-rwxr-xr-xt/t5001-archive-attr.sh91
-rwxr-xr-xt/t5100-mailinfo.sh92
-rw-r--r--t/t5100/.gitattributes4
-rw-r--r--t/t5100/empty0
-rw-r--r--t/t5100/info-from.expect5
-rw-r--r--t/t5100/info-from.in8
-rw-r--r--t/t5100/info00015
-rw-r--r--t/t5100/info00025
-rw-r--r--t/t5100/info00035
-rw-r--r--t/t5100/info00045
-rw-r--r--t/t5100/info00055
-rw-r--r--t/t5100/info00065
-rw-r--r--t/t5100/info00075
-rw-r--r--t/t5100/info00085
-rw-r--r--t/t5100/info00095
-rw-r--r--t/t5100/info00105
-rw-r--r--t/t5100/info00115
-rw-r--r--t/t5100/info00125
-rw-r--r--t/t5100/info00135
-rw-r--r--t/t5100/info00145
-rw-r--r--t/t5100/info0014--scissors5
-rw-r--r--t/t5100/info00155
-rw-r--r--t/t5100/info0015--no-inbody-headers5
-rw-r--r--t/t5100/info00165
-rw-r--r--t/t5100/info0016--no-inbody-headers5
-rw-r--r--t/t5100/msg00012
-rw-r--r--t/t5100/msg000221
-rw-r--r--t/t5100/msg00039
-rw-r--r--t/t5100/msg00047
-rw-r--r--t/t5100/msg000513
-rw-r--r--t/t5100/msg00062
-rw-r--r--t/t5100/msg00072
-rw-r--r--t/t5100/msg00084
-rw-r--r--t/t5100/msg00092
-rw-r--r--t/t5100/msg00105
-rw-r--r--t/t5100/msg00112
-rw-r--r--t/t5100/msg00127
-rw-r--r--t/t5100/msg00130
-rw-r--r--t/t5100/msg001418
-rw-r--r--t/t5100/msg0014--scissors4
-rw-r--r--t/t5100/msg00152
-rw-r--r--t/t5100/msg0015--no-inbody-headers3
-rw-r--r--t/t5100/msg00162
-rw-r--r--t/t5100/msg0016--no-inbody-headers4
-rw-r--r--t/t5100/nul-b64.expectbin0 -> 1672 bytes
-rw-r--r--t/t5100/nul-b64.in37
-rw-r--r--t/t5100/nul-plainbin0 -> 91 bytes
-rw-r--r--t/t5100/patch000114
-rw-r--r--t/t5100/patch000214
-rw-r--r--t/t5100/patch000314
-rw-r--r--t/t5100/patch000493
-rw-r--r--t/t5100/patch000569
-rw-r--r--t/t5100/patch000614
-rw-r--r--t/t5100/patch00070
-rw-r--r--t/t5100/patch00080
-rw-r--r--t/t5100/patch000913
-rw-r--r--t/t5100/patch001020
-rw-r--r--t/t5100/patch001122
-rw-r--r--t/t5100/patch001230
-rw-r--r--t/t5100/patch00130
-rw-r--r--t/t5100/patch001464
-rw-r--r--t/t5100/patch0014--scissors64
-rw-r--r--t/t5100/patch00158
-rw-r--r--t/t5100/patch0015--no-inbody-headers8
-rw-r--r--t/t5100/patch00168
-rw-r--r--t/t5100/patch0016--no-inbody-headers8
-rw-r--r--t/t5100/rfc2047-info-00014
-rw-r--r--t/t5100/rfc2047-info-00024
-rw-r--r--t/t5100/rfc2047-info-00034
-rw-r--r--t/t5100/rfc2047-info-00044
-rw-r--r--t/t5100/rfc2047-info-00052
-rw-r--r--t/t5100/rfc2047-info-00062
-rw-r--r--t/t5100/rfc2047-info-00072
-rw-r--r--t/t5100/rfc2047-info-00082
-rw-r--r--t/t5100/rfc2047-info-00092
-rw-r--r--t/t5100/rfc2047-info-00102
-rw-r--r--t/t5100/rfc2047-info-00112
-rw-r--r--t/t5100/rfc2047-samples.mbox48
-rw-r--r--t/t5100/sample.mbox685
-rwxr-xr-xt/t5150-request-pull.sh228
-rwxr-xr-xt/t5300-pack-object.sh417
-rwxr-xr-xt/t5301-sliding-window.sh60
-rwxr-xr-xt/t5302-pack-index.sh225
-rwxr-xr-xt/t5303-pack-corruption-resilience.sh287
-rwxr-xr-xt/t5304-prune.sh197
-rwxr-xr-xt/t5305-include-tag.sh84
-rwxr-xr-xt/t5306-pack-nobase.sh80
-rwxr-xr-xt/t5307-pack-missing-commit.sh39
-rwxr-xr-xt/t5400-send-pack.sh225
-rwxr-xr-xt/t5401-update-hooks.sh138
-rwxr-xr-xt/t5402-post-merge-hook.sh56
-rwxr-xr-xt/t5403-post-checkout-hook.sh88
-rwxr-xr-xt/t5404-tracking-branches.sh62
-rwxr-xr-xt/t5405-send-pack-rewind.sh43
-rwxr-xr-xt/t5406-remote-rejects.sh24
-rwxr-xr-xt/t5407-post-rewrite-hook.sh199
-rwxr-xr-xt/t5500-fetch-pack.sh251
-rwxr-xr-xt/t5502-quickfetch.sh142
-rwxr-xr-xt/t5503-tagfollow.sh171
-rwxr-xr-xt/t5505-remote.sh867
-rwxr-xr-xt/t5506-remote-groups.sh98
-rwxr-xr-xt/t5510-fetch.sh394
-rwxr-xr-xt/t5511-refspec.sh87
-rwxr-xr-xt/t5512-ls-remote.sh126
-rwxr-xr-xt/t5513-fetch-track.sh30
-rwxr-xr-xt/t5514-fetch-multiple.sh154
-rwxr-xr-xt/t5515-fetch-merge-logic.sh175
-rw-r--r--t/t5515/fetch.br-branches-default8
-rw-r--r--t/t5515/fetch.br-branches-default-merge9
-rw-r--r--t/t5515/fetch.br-branches-default-merge_branches-default9
-rw-r--r--t/t5515/fetch.br-branches-default-octopus10
-rw-r--r--t/t5515/fetch.br-branches-default-octopus_branches-default10
-rw-r--r--t/t5515/fetch.br-branches-default_branches-default8
-rw-r--r--t/t5515/fetch.br-branches-one8
-rw-r--r--t/t5515/fetch.br-branches-one-merge9
-rw-r--r--t/t5515/fetch.br-branches-one-merge_branches-one9
-rw-r--r--t/t5515/fetch.br-branches-one-octopus9
-rw-r--r--t/t5515/fetch.br-branches-one-octopus_branches-one9
-rw-r--r--t/t5515/fetch.br-branches-one_branches-one8
-rw-r--r--t/t5515/fetch.br-config-explicit11
-rw-r--r--t/t5515/fetch.br-config-explicit-merge11
-rw-r--r--t/t5515/fetch.br-config-explicit-merge_config-explicit11
-rw-r--r--t/t5515/fetch.br-config-explicit-octopus11
-rw-r--r--t/t5515/fetch.br-config-explicit-octopus_config-explicit11
-rw-r--r--t/t5515/fetch.br-config-explicit_config-explicit11
-rw-r--r--t/t5515/fetch.br-config-glob11
-rw-r--r--t/t5515/fetch.br-config-glob-merge11
-rw-r--r--t/t5515/fetch.br-config-glob-merge_config-glob11
-rw-r--r--t/t5515/fetch.br-config-glob-octopus11
-rw-r--r--t/t5515/fetch.br-config-glob-octopus_config-glob11
-rw-r--r--t/t5515/fetch.br-config-glob_config-glob11
-rw-r--r--t/t5515/fetch.br-remote-explicit11
-rw-r--r--t/t5515/fetch.br-remote-explicit-merge11
-rw-r--r--t/t5515/fetch.br-remote-explicit-merge_remote-explicit11
-rw-r--r--t/t5515/fetch.br-remote-explicit-octopus11
-rw-r--r--t/t5515/fetch.br-remote-explicit-octopus_remote-explicit11
-rw-r--r--t/t5515/fetch.br-remote-explicit_remote-explicit11
-rw-r--r--t/t5515/fetch.br-remote-glob11
-rw-r--r--t/t5515/fetch.br-remote-glob-merge11
-rw-r--r--t/t5515/fetch.br-remote-glob-merge_remote-glob11
-rw-r--r--t/t5515/fetch.br-remote-glob-octopus11
-rw-r--r--t/t5515/fetch.br-remote-glob-octopus_remote-glob11
-rw-r--r--t/t5515/fetch.br-remote-glob_remote-glob11
-rw-r--r--t/t5515/fetch.br-unconfig11
-rw-r--r--t/t5515/fetch.br-unconfig_--tags_.._.git7
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git2
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git_one2
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file8
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git_one_two3
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file7
-rw-r--r--t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three7
-rw-r--r--t/t5515/fetch.br-unconfig_branches-default8
-rw-r--r--t/t5515/fetch.br-unconfig_branches-one8
-rw-r--r--t/t5515/fetch.br-unconfig_config-explicit11
-rw-r--r--t/t5515/fetch.br-unconfig_config-glob11
-rw-r--r--t/t5515/fetch.br-unconfig_remote-explicit11
-rw-r--r--t/t5515/fetch.br-unconfig_remote-glob11
-rw-r--r--t/t5515/fetch.master11
-rw-r--r--t/t5515/fetch.master_--tags_.._.git7
-rw-r--r--t/t5515/fetch.master_.._.git2
-rw-r--r--t/t5515/fetch.master_.._.git_one2
-rw-r--r--t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file8
-rw-r--r--t/t5515/fetch.master_.._.git_one_two3
-rw-r--r--t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file7
-rw-r--r--t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three7
-rw-r--r--t/t5515/fetch.master_branches-default8
-rw-r--r--t/t5515/fetch.master_branches-one8
-rw-r--r--t/t5515/fetch.master_config-explicit11
-rw-r--r--t/t5515/fetch.master_config-glob11
-rw-r--r--t/t5515/fetch.master_remote-explicit11
-rw-r--r--t/t5515/fetch.master_remote-glob11
-rw-r--r--t/t5515/refs.br-branches-default12
-rw-r--r--t/t5515/refs.br-branches-default-merge12
-rw-r--r--t/t5515/refs.br-branches-default-merge_branches-default12
-rw-r--r--t/t5515/refs.br-branches-default-octopus12
-rw-r--r--t/t5515/refs.br-branches-default-octopus_branches-default12
-rw-r--r--t/t5515/refs.br-branches-default_branches-default12
-rw-r--r--t/t5515/refs.br-branches-one12
-rw-r--r--t/t5515/refs.br-branches-one-merge12
-rw-r--r--t/t5515/refs.br-branches-one-merge_branches-one12
-rw-r--r--t/t5515/refs.br-branches-one-octopus12
-rw-r--r--t/t5515/refs.br-branches-one-octopus_branches-one12
-rw-r--r--t/t5515/refs.br-branches-one_branches-one12
-rw-r--r--t/t5515/refs.br-config-explicit15
-rw-r--r--t/t5515/refs.br-config-explicit-merge15
-rw-r--r--t/t5515/refs.br-config-explicit-merge_config-explicit15
-rw-r--r--t/t5515/refs.br-config-explicit-octopus15
-rw-r--r--t/t5515/refs.br-config-explicit-octopus_config-explicit15
-rw-r--r--t/t5515/refs.br-config-explicit_config-explicit15
-rw-r--r--t/t5515/refs.br-config-glob15
-rw-r--r--t/t5515/refs.br-config-glob-merge15
-rw-r--r--t/t5515/refs.br-config-glob-merge_config-glob15
-rw-r--r--t/t5515/refs.br-config-glob-octopus15
-rw-r--r--t/t5515/refs.br-config-glob-octopus_config-glob15
-rw-r--r--t/t5515/refs.br-config-glob_config-glob15
-rw-r--r--t/t5515/refs.br-remote-explicit15
-rw-r--r--t/t5515/refs.br-remote-explicit-merge15
-rw-r--r--t/t5515/refs.br-remote-explicit-merge_remote-explicit15
-rw-r--r--t/t5515/refs.br-remote-explicit-octopus15
-rw-r--r--t/t5515/refs.br-remote-explicit-octopus_remote-explicit15
-rw-r--r--t/t5515/refs.br-remote-explicit_remote-explicit15
-rw-r--r--t/t5515/refs.br-remote-glob15
-rw-r--r--t/t5515/refs.br-remote-glob-merge15
-rw-r--r--t/t5515/refs.br-remote-glob-merge_remote-glob15
-rw-r--r--t/t5515/refs.br-remote-glob-octopus15
-rw-r--r--t/t5515/refs.br-remote-glob-octopus_remote-glob15
-rw-r--r--t/t5515/refs.br-remote-glob_remote-glob15
-rw-r--r--t/t5515/refs.br-unconfig11
-rw-r--r--t/t5515/refs.br-unconfig_--tags_.._.git11
-rw-r--r--t/t5515/refs.br-unconfig_.._.git5
-rw-r--r--t/t5515/refs.br-unconfig_.._.git_one5
-rw-r--r--t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file11
-rw-r--r--t/t5515/refs.br-unconfig_.._.git_one_two5
-rw-r--r--t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file11
-rw-r--r--t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three11
-rw-r--r--t/t5515/refs.br-unconfig_branches-default12
-rw-r--r--t/t5515/refs.br-unconfig_branches-one12
-rw-r--r--t/t5515/refs.br-unconfig_config-explicit15
-rw-r--r--t/t5515/refs.br-unconfig_config-glob15
-rw-r--r--t/t5515/refs.br-unconfig_remote-explicit15
-rw-r--r--t/t5515/refs.br-unconfig_remote-glob15
-rw-r--r--t/t5515/refs.master11
-rw-r--r--t/t5515/refs.master_--tags_.._.git11
-rw-r--r--t/t5515/refs.master_.._.git5
-rw-r--r--t/t5515/refs.master_.._.git_one5
-rw-r--r--t/t5515/refs.master_.._.git_one_tag_tag-one_tag_tag-three-file11
-rw-r--r--t/t5515/refs.master_.._.git_one_two5
-rw-r--r--t/t5515/refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file11
-rw-r--r--t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three11
-rw-r--r--t/t5515/refs.master_branches-default12
-rw-r--r--t/t5515/refs.master_branches-one12
-rw-r--r--t/t5515/refs.master_config-explicit15
-rw-r--r--t/t5515/refs.master_config-glob15
-rw-r--r--t/t5515/refs.master_remote-explicit15
-rw-r--r--t/t5515/refs.master_remote-glob15
-rwxr-xr-xt/t5516-fetch-push.sh785
-rwxr-xr-xt/t5517-push-mirror.sh268
-rwxr-xr-xt/t5518-fetch-exit-status.sh37
-rwxr-xr-xt/t5519-push-alternates.sh143
-rwxr-xr-xt/t5520-pull.sh225
-rwxr-xr-xt/t5521-pull-options.sh93
-rwxr-xr-xt/t5522-pull-symlink.sh84
-rwxr-xr-xt/t5523-push-upstream.sh69
-rwxr-xr-xt/t5524-pull-msg.sh35
-rwxr-xr-xt/t5525-fetch-tagopt.sh41
-rwxr-xr-xt/t5530-upload-pack-error.sh95
-rwxr-xr-xt/t5531-deep-submodule-push.sh35
-rwxr-xr-xt/t5540-http-push.sh145
-rwxr-xr-xt/t5541-http-push.sh141
-rwxr-xr-xt/t5550-http-fetch.sh102
-rwxr-xr-xt/t5551-http-fetch.sh105
-rwxr-xr-xt/t5560-http-backend-noserver.sh73
-rwxr-xr-xt/t5561-http-backend.sh149
-rwxr-xr-xt/t556x_common122
-rwxr-xr-xt/t5600-clone-fail-cleanup.sh42
-rwxr-xr-xt/t5601-clone.sh195
-rwxr-xr-xt/t5602-clone-remote-exec.sh26
-rwxr-xr-xt/t5700-clone-reference.sh149
-rwxr-xr-xt/t5701-clone-local.sh147
-rwxr-xr-xt/t5702-clone-options.sh36
-rwxr-xr-xt/t5704-bundle.sh49
-rwxr-xr-xt/t5705-clone-2gb.sh53
-rwxr-xr-xt/t5706-clone-branch.sh68
-rwxr-xr-xt/t5710-info-alternate.sh112
-rwxr-xr-xt/t5800-remote-helpers.sh80
-rwxr-xr-xt/t6001-rev-list-graft.sh113
-rwxr-xr-xt/t6002-rev-list-bisect.sh238
-rwxr-xr-xt/t6003-rev-list-topo-order.sh408
-rwxr-xr-xt/t6004-rev-list-path-optim.sh51
-rwxr-xr-xt/t6005-rev-list-count.sh51
-rwxr-xr-xt/t6006-rev-list-format.sh271
-rwxr-xr-xt/t6007-rev-list-cherry-pick-file.sh86
-rwxr-xr-xt/t6008-rev-list-submodule.sh42
-rwxr-xr-xt/t6009-rev-list-parent.sh38
-rwxr-xr-xt/t6010-merge-base.sh233
-rwxr-xr-xt/t6011-rev-list-with-bad-commit.sh60
-rwxr-xr-xt/t6012-rev-list-simplify.sh90
-rwxr-xr-xt/t6013-rev-list-reverse-parents.sh42
-rwxr-xr-xt/t6014-rev-list-all.sh38
-rwxr-xr-xt/t6015-rev-list-show-all-parents.sh31
-rwxr-xr-xt/t6016-rev-list-graph-simplify-history.sh276
-rwxr-xr-xt/t6017-rev-list-stdin.sh61
-rwxr-xr-xt/t6018-rev-list-glob.sh216
-rwxr-xr-xt/t6019-rev-list-ancestry-path.sh73
-rwxr-xr-xt/t6020-merge-df.sh48
-rwxr-xr-xt/t6021-merge-criss-cross.sh96
-rwxr-xr-xt/t6022-merge-rename.sh344
-rwxr-xr-xt/t6023-merge-file.sh255
-rwxr-xr-xt/t6024-recursive-merge.sh122
-rwxr-xr-xt/t6025-merge-symlinks.sh61
-rwxr-xr-xt/t6026-merge-attr.sh179
-rwxr-xr-xt/t6027-merge-binary.sh67
-rwxr-xr-xt/t6028-merge-up-to-date.sh77
-rwxr-xr-xt/t6029-merge-subtree.sh124
-rwxr-xr-xt/t6030-bisect-porcelain.sh577
-rwxr-xr-xt/t6031-merge-recursive.sh87
-rwxr-xr-xt/t6032-merge-large-rename.sh73
-rwxr-xr-xt/t6033-merge-crlf.sh44
-rwxr-xr-xt/t6034-merge-rename-nocruft.sh139
-rwxr-xr-xt/t6035-merge-dir-to-symlink.sh143
-rwxr-xr-xt/t6036-recursive-corner-cases.sh55
-rwxr-xr-xt/t6037-merge-ours-theirs.sh64
-rwxr-xr-xt/t6038-merge-text-auto.sh189
-rwxr-xr-xt/t6040-tracking-info.sh113
-rwxr-xr-xt/t6050-replace.sh230
-rwxr-xr-xt/t6101-rev-parse-parents.sh44
-rwxr-xr-xt/t6120-describe.sh174
-rwxr-xr-xt/t6200-fmt-merge-msg.sh363
-rwxr-xr-xt/t6300-for-each-ref.sh362
-rwxr-xr-xt/t7001-mv.sh258
-rwxr-xr-xt/t7003-filter-branch.sh349
-rwxr-xr-xt/t7004-tag.sh1219
-rw-r--r--t/t7004/pubring.gpgbin0 -> 1164 bytes
-rw-r--r--t/t7004/random_seedbin0 -> 600 bytes
-rw-r--r--t/t7004/secring.gpgbin0 -> 1237 bytes
-rw-r--r--t/t7004/trustdb.gpgbin0 -> 1280 bytes
-rwxr-xr-xt/t7005-editor.sh137
-rwxr-xr-xt/t7006-pager.sh438
-rwxr-xr-xt/t7006/test-terminal.perl58
-rwxr-xr-xt/t7007-show.sh20
-rwxr-xr-xt/t7008-grep-binary.sh102
-rwxr-xr-xt/t7010-setup.sh161
-rwxr-xr-xt/t7011-skip-worktree-reading.sh163
-rwxr-xr-xt/t7012-skip-worktree-writing.sh146
-rwxr-xr-xt/t7060-wtstatus.sh59
-rwxr-xr-xt/t7101-reset.sh63
-rwxr-xr-xt/t7102-reset.sh479
-rwxr-xr-xt/t7103-reset-bare.sh69
-rwxr-xr-xt/t7104-reset.sh46
-rwxr-xr-xt/t7105-reset-patch.sh69
-rwxr-xr-xt/t7110-reset-merge.sh295
-rwxr-xr-xt/t7111-reset-table.sh121
-rwxr-xr-xt/t7201-co.sh671
-rwxr-xr-xt/t7300-clean.sh456
-rwxr-xr-xt/t7400-submodule-basic.sh430
-rwxr-xr-xt/t7401-submodule-summary.sh237
-rwxr-xr-xt/t7402-submodule-rebase.sh92
-rwxr-xr-xt/t7403-submodule-sync.sh67
-rwxr-xr-xt/t7405-submodule-merge.sh185
-rwxr-xr-xt/t7406-submodule-update.sh206
-rwxr-xr-xt/t7407-submodule-foreach.sh241
-rwxr-xr-xt/t7408-submodule-reference.sh81
-rwxr-xr-xt/t7500-commit.sh218
-rwxr-xr-xt/t7500/add-comments4
-rwxr-xr-xt/t7500/add-content3
-rwxr-xr-xt/t7500/add-signed-off3
-rwxr-xr-xt/t7501-commit.sh440
-rwxr-xr-xt/t7502-commit.sh447
-rwxr-xr-xt/t7503-pre-commit-hook.sh88
-rwxr-xr-xt/t7504-commit-msg-hook.sh223
-rwxr-xr-xt/t7505-prepare-commit-msg-hook.sh159
-rwxr-xr-xt/t7506-status-submodule.sh190
-rwxr-xr-xt/t7507-commit-verbose.sh73
-rwxr-xr-xt/t7508-status.sh1113
-rwxr-xr-xt/t7509-commit.sh160
-rwxr-xr-xt/t7600-merge.sh552
-rwxr-xr-xt/t7601-merge-pull-config.sh156
-rwxr-xr-xt/t7602-merge-octopus-many.sh103
-rwxr-xr-xt/t7603-merge-reduce-heads.sh116
-rwxr-xr-xt/t7604-merge-custom-message.sh50
-rwxr-xr-xt/t7605-merge-resolve.sh48
-rwxr-xr-xt/t7606-merge-custom.sh93
-rwxr-xr-xt/t7607-merge-overwrite.sh87
-rwxr-xr-xt/t7608-merge-messages.sh60
-rwxr-xr-xt/t7609-merge-co-error-msgs.sh133
-rwxr-xr-xt/t7610-mergetool.sh114
-rwxr-xr-xt/t7700-repack.sh168
-rwxr-xr-xt/t7701-repack-unpack-unreachable.sh98
-rwxr-xr-xt/t7800-difftool.sh271
-rwxr-xr-xt/t7810-grep.sh530
-rwxr-xr-xt/t7811-grep-open.sh168
-rwxr-xr-xt/t8001-annotate.sh15
-rwxr-xr-xt/t8002-blame.sh9
-rwxr-xr-xt/t8003-blame.sh188
-rwxr-xr-xt/t8004-blame.sh73
-rwxr-xr-xt/t8005-blame-i18n.sh92
-rw-r--r--t/t8005/euc-japan.txt2
-rw-r--r--t/t8005/sjis.txt2
-rw-r--r--t/t8005/utf8.txt2
-rwxr-xr-xt/t8006-blame-textconv.sh80
-rwxr-xr-xt/t8007-cat-file-textconv.sh70
-rwxr-xr-xt/t9001-send-email.sh1035
-rwxr-xr-xt/t9010-svn-fe.sh32
-rwxr-xr-xt/t9100-git-svn-basic.sh302
-rwxr-xr-xt/t9101-git-svn-props.sh220
-rwxr-xr-xt/t9102-git-svn-deep-rmdir.sh30
-rwxr-xr-xt/t9103-git-svn-tracked-directory-removed.sh39
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh213
-rwxr-xr-xt/t9105-git-svn-commit-diff.sh43
-rwxr-xr-xt/t9106-git-svn-commit-diff-clobber.sh101
-rwxr-xr-xt/t9107-git-svn-migrate.sh121
-rwxr-xr-xt/t9108-git-svn-glob.sh111
-rwxr-xr-xt/t9109-git-svn-multi-glob.sh160
-rwxr-xr-xt/t9110-git-svn-use-svm-props.sh61
-rw-r--r--t/t9110/svm.dump511
-rwxr-xr-xt/t9111-git-svn-use-svnsync-props.sh51
-rw-r--r--t/t9111/svnsync.dump560
-rwxr-xr-xt/t9112-git-svn-md5less-file.sh47
-rwxr-xr-xt/t9113-git-svn-dcommit-new-file.sh35
-rwxr-xr-xt/t9114-git-svn-dcommit-merge.sh94
-rwxr-xr-xt/t9115-git-svn-dcommit-funky-renames.sh87
-rw-r--r--t/t9115/funky-names.dump103
-rwxr-xr-xt/t9116-git-svn-log.sh128
-rwxr-xr-xt/t9117-git-svn-init-clone.sh55
-rwxr-xr-xt/t9118-git-svn-funky-branch-names.sh81
-rwxr-xr-xt/t9119-git-svn-info.sh378
-rwxr-xr-xt/t9120-git-svn-clone-with-percent-escapes.sh78
-rwxr-xr-xt/t9121-git-svn-fetch-renamed-dir.sh20
-rw-r--r--t/t9121/renamed-dir.dump90
-rwxr-xr-xt/t9122-git-svn-author.sh84
-rwxr-xr-xt/t9123-git-svn-rebuild-with-rewriteroot.sh32
-rwxr-xr-xt/t9124-git-svn-dcommit-auto-props.sh101
-rwxr-xr-xt/t9125-git-svn-multi-glob-branch-names.sh37
-rwxr-xr-xt/t9126-git-svn-follow-deleted-readded-directory.sh22
-rw-r--r--t/t9126/follow-deleted-readded.dump201
-rwxr-xr-xt/t9127-git-svn-partial-rebuild.sh59
-rwxr-xr-xt/t9128-git-svn-cmd-branch.sh78
-rwxr-xr-xt/t9129-git-svn-i18n-commitencoding.sh101
-rwxr-xr-xt/t9130-git-svn-authors-file.sh115
-rwxr-xr-xt/t9131-git-svn-empty-symlink.sh110
-rwxr-xr-xt/t9132-git-svn-broken-symlink.sh102
-rwxr-xr-xt/t9133-git-svn-nested-git-repo.sh101
-rwxr-xr-xt/t9134-git-svn-ignore-paths.sh147
-rwxr-xr-xt/t9135-git-svn-moved-branch-empty-file.sh21
-rw-r--r--t/t9135/svn.dump192
-rwxr-xr-xt/t9136-git-svn-recreated-branch-empty-file.sh12
-rw-r--r--t/t9136/svn.dump192
-rwxr-xr-xt/t9137-git-svn-dcommit-clobber-series.sh63
-rwxr-xr-xt/t9138-git-svn-authors-prog.sh83
-rwxr-xr-xt/t9139-git-svn-non-utf8-commitencoding.sh47
-rwxr-xr-xt/t9140-git-svn-reset.sh66
-rwxr-xr-xt/t9141-git-svn-multiple-branches.sh122
-rwxr-xr-xt/t9142-git-svn-shallow-clone.sh32
-rwxr-xr-xt/t9143-git-svn-gc.sh53
-rwxr-xr-xt/t9144-git-svn-old-rev_map.sh31
-rwxr-xr-xt/t9145-git-svn-master-branch.sh25
-rwxr-xr-xt/t9146-git-svn-empty-dirs.sh142
-rwxr-xr-xt/t9150-svk-mergetickets.sh25
-rw-r--r--t/t9150/make-svk-dump57
-rw-r--r--t/t9150/svk-merge.dump616
-rwxr-xr-xt/t9151-svn-mergeinfo.sh57
-rw-r--r--t/t9151/.gitignore2
-rw-r--r--t/t9151/make-svnmerge-dump305
-rw-r--r--t/t9151/svn-mergeinfo.dump2388
-rwxr-xr-xt/t9152-svn-empty-dirs-after-gc.sh40
-rwxr-xr-xt/t9153-git-svn-rewrite-uuid.sh25
-rw-r--r--t/t9153/svn.dump75
-rwxr-xr-xt/t9154-git-svn-fancy-glob.sh42
-rw-r--r--t/t9154/svn.dump222
-rwxr-xr-xt/t9155-git-svn-fetch-deleted-tag.sh42
-rwxr-xr-xt/t9156-git-svn-fetch-deleted-tag-2.sh44
-rwxr-xr-xt/t9200-git-cvsexportcommit.sh337
-rwxr-xr-xt/t9300-fast-import.sh1696
-rwxr-xr-xt/t9301-fast-import-notes.sh623
-rwxr-xr-xt/t9350-fast-export.sh417
-rwxr-xr-xt/t9400-git-cvsserver-server.sh520
-rwxr-xr-xt/t9401-git-cvsserver-crlf.sh332
-rwxr-xr-xt/t9500-gitweb-standalone-no-errors.sh679
-rwxr-xr-xt/t9501-gitweb-standalone-http-status.sh138
-rwxr-xr-xt/t9502-gitweb-standalone-parse-output.sh115
-rwxr-xr-xt/t9600-cvsimport.sh158
-rwxr-xr-xt/t9601-cvsimport-vendor-branch.sh85
-rw-r--r--t/t9601/cvsroot/.gitattributes1
-rw-r--r--t/t9601/cvsroot/CVSROOT/.gitignore2
-rw-r--r--t/t9601/cvsroot/module/added-imported.txt,v44
-rw-r--r--t/t9601/cvsroot/module/imported-anonymously.txt,v42
-rw-r--r--t/t9601/cvsroot/module/imported-modified-imported.txt,v76
-rw-r--r--t/t9601/cvsroot/module/imported-modified.txt,v59
-rw-r--r--t/t9601/cvsroot/module/imported-once.txt,v43
-rw-r--r--t/t9601/cvsroot/module/imported-twice.txt,v60
-rwxr-xr-xt/t9602-cvsimport-branches-tags.sh78
-rw-r--r--t/t9602/README62
-rw-r--r--t/t9602/cvsroot/.gitattributes1
-rw-r--r--t/t9602/cvsroot/CVSROOT/.gitignore2
-rw-r--r--t/t9602/cvsroot/module/default,v102
-rw-r--r--t/t9602/cvsroot/module/sub1/default,v102
-rw-r--r--t/t9602/cvsroot/module/sub1/subsubA/default,v101
-rw-r--r--t/t9602/cvsroot/module/sub1/subsubB/default,v107
-rw-r--r--t/t9602/cvsroot/module/sub2/Attic/branch_B_MIXED_only,v59
-rw-r--r--t/t9602/cvsroot/module/sub2/default,v102
-rw-r--r--t/t9602/cvsroot/module/sub2/subsubA/default,v102
-rw-r--r--t/t9602/cvsroot/module/sub3/default,v102
-rwxr-xr-xt/t9603-cvsimport-patchsets.sh39
-rw-r--r--t/t9603/cvsroot/.gitattributes1
-rw-r--r--t/t9603/cvsroot/CVSROOT/.gitignore2
-rw-r--r--t/t9603/cvsroot/module/a,v74
-rw-r--r--t/t9603/cvsroot/module/b,v90
-rwxr-xr-xt/t9700-perl-git.sh56
-rwxr-xr-xt/t9700/test.pl119
-rw-r--r--t/test-lib.sh990
-rw-r--r--t/test4012.pngbin0 -> 5660 bytes
-rw-r--r--t/test9200a.pngbin0 -> 5660 bytes
-rw-r--r--t/test9200b.pngbin0 -> 275 bytes
-rw-r--r--t/valgrind/.gitignore2
-rwxr-xr-xt/valgrind/analyze.sh123
-rw-r--r--t/valgrind/default.supp45
-rwxr-xr-xt/valgrind/valgrind.sh22
-rw-r--r--tag.c135
-rw-r--r--tag.h20
-rw-r--r--tar.h25
-rw-r--r--templates/.gitignore2
-rw-r--r--templates/Makefile66
-rw-r--r--templates/branches--1
-rwxr-xr-xtemplates/hooks--applypatch-msg.sample15
-rwxr-xr-xtemplates/hooks--commit-msg.sample24
-rwxr-xr-xtemplates/hooks--post-commit.sample8
-rwxr-xr-xtemplates/hooks--post-receive.sample15
-rwxr-xr-xtemplates/hooks--post-update.sample8
-rwxr-xr-xtemplates/hooks--pre-applypatch.sample14
-rwxr-xr-xtemplates/hooks--pre-commit.sample46
-rwxr-xr-xtemplates/hooks--pre-rebase.sample169
-rwxr-xr-xtemplates/hooks--prepare-commit-msg.sample36
-rwxr-xr-xtemplates/hooks--update.sample128
-rw-r--r--templates/info--exclude6
-rw-r--r--templates/this--description1
-rw-r--r--test-chmtime.c119
-rw-r--r--test-ctype.c78
-rw-r--r--test-date.c70
-rw-r--r--test-delta.c78
-rw-r--r--test-dump-cache-tree.c64
-rw-r--r--test-genrandom.c33
-rw-r--r--test-index-version.c14
-rw-r--r--test-line-buffer.c46
-rw-r--r--test-match-trees.c24
-rw-r--r--test-obj-pool.c116
-rw-r--r--test-parse-options.c92
-rw-r--r--test-path-utils.c38
-rw-r--r--test-run-command.c35
-rw-r--r--test-sha1.c47
-rwxr-xr-xtest-sha1.sh83
-rw-r--r--test-sigchain.c22
-rw-r--r--test-string-pool.c31
-rw-r--r--test-svn-fe.c17
-rw-r--r--test-treap.c65
-rw-r--r--thread-utils.c61
-rw-r--r--thread-utils.h7
-rw-r--r--trace.c133
-rw-r--r--transport-helper.c864
-rw-r--r--transport.c1190
-rw-r--r--transport.h168
-rw-r--r--tree-diff.c486
-rw-r--r--tree-walk.c457
-rw-r--r--tree-walk.h63
-rw-r--r--tree.c286
-rw-r--r--tree.h33
-rw-r--r--unimplemented.sh4
-rw-r--r--unpack-trees.c1588
-rw-r--r--unpack-trees.h85
-rw-r--r--upload-pack.c731
-rw-r--r--url.c127
-rw-r--r--url.h10
-rw-r--r--usage.c117
-rw-r--r--userdiff.c243
-rw-r--r--userdiff.h26
-rw-r--r--utf8.c475
-rw-r--r--utf8.h20
-rw-r--r--vcs-svn/LICENSE33
-rw-r--r--vcs-svn/fast_export.c76
-rw-r--r--vcs-svn/fast_export.h11
-rw-r--r--vcs-svn/line_buffer.c97
-rw-r--r--vcs-svn/line_buffer.h12
-rw-r--r--vcs-svn/line_buffer.txt58
-rw-r--r--vcs-svn/obj_pool.h61
-rw-r--r--vcs-svn/repo_tree.c329
-rw-r--r--vcs-svn/repo_tree.h26
-rw-r--r--vcs-svn/string_pool.c102
-rw-r--r--vcs-svn/string_pool.h11
-rw-r--r--vcs-svn/string_pool.txt43
-rw-r--r--vcs-svn/svndump.c302
-rw-r--r--vcs-svn/svndump.h9
-rw-r--r--vcs-svn/trp.h236
-rw-r--r--vcs-svn/trp.txt103
-rw-r--r--walker.c320
-rw-r--r--walker.h39
-rw-r--r--wrap-for-bin.sh21
-rw-r--r--wrapper.c355
-rw-r--r--write_or_die.c86
-rw-r--r--ws.c386
-rw-r--r--wt-status.c869
-rw-r--r--wt-status.h69
-rw-r--r--xdiff-interface.c361
-rw-r--r--xdiff-interface.h28
-rw-r--r--xdiff/xdiff.h134
-rw-r--r--xdiff/xdiffi.c569
-rw-r--r--xdiff/xdiffi.h61
-rw-r--r--xdiff/xemit.c205
-rw-r--r--xdiff/xemit.h36
-rw-r--r--xdiff/xinclude.h42
-rw-r--r--xdiff/xmacros.h53
-rw-r--r--xdiff/xmerge.c619
-rw-r--r--xdiff/xpatience.c381
-rw-r--r--xdiff/xprepare.c480
-rw-r--r--xdiff/xprepare.h34
-rw-r--r--xdiff/xtypes.h67
-rw-r--r--xdiff/xutils.c404
-rw-r--r--xdiff/xutils.h47
2009 files changed, 389788 insertions, 343 deletions
diff --git a/.gitattributes b/.gitattributes
index f96112d..5e98806 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
-* encoding=US-ASCII
-git-gui.sh encoding=UTF-8
-/po/*.po encoding=UTF-8
+* whitespace=!indent,trail,space
+*.[ch] whitespace=indent,trail,space
+*.sh whitespace=indent,trail,space
diff --git a/.gitignore b/.gitignore
index 6483b21..20560b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,217 @@
-.DS_Store
-config.mak
-Git Gui.app*
-git-gui.tcl
-GIT-VERSION-FILE
-GIT-GUI-VARS
-git-gui
-lib/tclIndex
+/GIT-BUILD-OPTIONS
+/GIT-CFLAGS
+/GIT-GUI-VARS
+/GIT-VERSION-FILE
+/bin-wrappers/
+/git
+/git-add
+/git-add--interactive
+/git-am
+/git-annotate
+/git-apply
+/git-archimport
+/git-archive
+/git-bisect
+/git-bisect--helper
+/git-blame
+/git-branch
+/git-bundle
+/git-cat-file
+/git-check-attr
+/git-check-ref-format
+/git-checkout
+/git-checkout-index
+/git-cherry
+/git-cherry-pick
+/git-clean
+/git-clone
+/git-commit
+/git-commit-tree
+/git-config
+/git-count-objects
+/git-cvsexportcommit
+/git-cvsimport
+/git-cvsserver
+/git-daemon
+/git-diff
+/git-diff-files
+/git-diff-index
+/git-diff-tree
+/git-difftool
+/git-difftool--helper
+/git-describe
+/git-fast-export
+/git-fast-import
+/git-fetch
+/git-fetch--tool
+/git-fetch-pack
+/git-filter-branch
+/git-fmt-merge-msg
+/git-for-each-ref
+/git-format-patch
+/git-fsck
+/git-fsck-objects
+/git-gc
+/git-get-tar-commit-id
+/git-grep
+/git-hash-object
+/git-help
+/git-http-backend
+/git-http-fetch
+/git-http-push
+/git-imap-send
+/git-index-pack
+/git-init
+/git-init-db
+/git-instaweb
+/git-log
+/git-lost-found
+/git-ls-files
+/git-ls-remote
+/git-ls-tree
+/git-mailinfo
+/git-mailsplit
+/git-merge
+/git-merge-base
+/git-merge-index
+/git-merge-file
+/git-merge-tree
+/git-merge-octopus
+/git-merge-one-file
+/git-merge-ours
+/git-merge-recursive
+/git-merge-resolve
+/git-merge-subtree
+/git-mergetool
+/git-mergetool--lib
+/git-mktag
+/git-mktree
+/git-name-rev
+/git-mv
+/git-notes
+/git-pack-redundant
+/git-pack-objects
+/git-pack-refs
+/git-parse-remote
+/git-patch-id
+/git-peek-remote
+/git-prune
+/git-prune-packed
+/git-pull
+/git-push
+/git-quiltimport
+/git-read-tree
+/git-rebase
+/git-rebase--interactive
+/git-receive-pack
+/git-reflog
+/git-relink
+/git-remote
+/git-remote-curl
+/git-remote-http
+/git-remote-https
+/git-remote-ftp
+/git-remote-ftps
+/git-remote-testgit
+/git-repack
+/git-replace
+/git-repo-config
+/git-request-pull
+/git-rerere
+/git-reset
+/git-rev-list
+/git-rev-parse
+/git-revert
+/git-rm
+/git-send-email
+/git-send-pack
+/git-sh-setup
+/git-shell
+/git-shortlog
+/git-show
+/git-show-branch
+/git-show-index
+/git-show-ref
+/git-stage
+/git-stash
+/git-status
+/git-stripspace
+/git-submodule
+/git-svn
+/git-symbolic-ref
+/git-tag
+/git-tar-tree
+/git-unpack-file
+/git-unpack-objects
+/git-update-index
+/git-update-ref
+/git-update-server-info
+/git-upload-archive
+/git-upload-pack
+/git-var
+/git-verify-pack
+/git-verify-tag
+/git-web--browse
+/git-whatchanged
+/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-svn-fe
+/test-treap
+/common-cmds.h
+*.tar.gz
+*.dsc
+*.deb
+/git.spec
+*.exe
+*.[aos]
+*.py[co]
+.depend/
+*.gcda
+*.gcno
+*.gcov
+/coverage-untested-functions
+/cover_db/
+/cover_db_html/
+*+
+/config.mak
+/autom4te.cache
+/config.cache
+/config.log
+/config.status
+/config.mak.autogen
+/config.mak.append
+/configure
+/tags
+/TAGS
+/cscope*
+*.obj
+*.lib
+*.sln
+*.suo
+*.ncb
+*.vcproj
+*.user
+*.idb
+*.pdb
+/Debug/
+/Release/
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..a8091eb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,69 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# 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>
+Chris Shoemaker <c.shoemaker@cox.net>
+Dana L. How <danahow@gmail.com>
+Dana L. How <how@deathvalley.cswitch.com>
+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>
+H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
+H. Peter Anvin <hpa@trantor.hos.anvin.org>
+Horst H. von Brand <vonbrand@inf.utfsm.cl>
+İsmail Dönmez <ismail@pardus.org.tr>
+Jay Soffian <jaysoffian+git@gmail.com>
+Joachim Berdal Haga <cjhaga@fys.uio.no>
+Jon Loeliger <jdl@freescale.com>
+Jon Seymour <jon@blackcubes.dyndns.org>
+Jonathan Nieder <jrnieder@uchicago.edu>
+Junio C Hamano <junio@twinsun.com>
+Karl Hasselström <kha@treskal.com>
+Kent Engstrom <kent@lysator.liu.se>
+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>
+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>
+Nanako Shiraishi <nanako3@lavabit.com>
+Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+<nico@fluxnic.net> <nico@cam.org>
+Philippe Bruhat <book@cpan.org>
+Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
+René Scharfe <rene.scharfe@lsrfire.ath.cx>
+Robert Fitzsimons <robfitz@273k.net>
+Sam Vilain <sam@vilain.net>
+Santi Béjar <sbejar@gmail.com>
+Sean Estabrooks <seanlkml@sympatico.ca>
+Shawn O. Pearce <spearce@spearce.org>
+Steven Grimm <koreth@midwinter.com>
+Theodore Ts'o <tytso@mit.edu>
+Tony Luck <tony.luck@intel.com>
+Uwe Kleine-König <Uwe_Zeisberger@digi.com>
+Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
+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>
+anonymous <linux@horizon.net>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..536e555
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,360 @@
+
+ Note that the only valid version of the GPL as far as this project
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+ HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ a good idea, I also ask that people involved with the project make
+ their preferences known. In particular, if you trust me to make that
+ decision, you might note so in your copyright message, ie something
+ like
+
+ This file is licensed under the GPL v2, or a later version
+ at the discretion of Linus.
+
+ might avoid issues. But we can also just decide to synchronize and
+ contact all copyright holders on record if/when the occasion arises.
+
+ Linus Torvalds
+
+----------------------------------------
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ 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.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+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 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
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+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.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ 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.)
+
+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
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+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.
+
+ 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
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 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
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+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 Lesser General
+Public License instead of this License.
diff --git a/Documentation/.gitattributes b/Documentation/.gitattributes
new file mode 100644
index 0000000..ddb0301
--- /dev/null
+++ b/Documentation/.gitattributes
@@ -0,0 +1 @@
+*.txt whitespace
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
new file mode 100644
index 0000000..1c3a9fe
--- /dev/null
+++ b/Documentation/.gitignore
@@ -0,0 +1,11 @@
+*.xml
+*.html
+*.[1-8]
+*.made
+*.texi
+git.info
+gitman.info
+howto-index.txt
+doc.dep
+cmds-*.txt
+manpage-base-url.xsl
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
new file mode 100644
index 0000000..b8bf618
--- /dev/null
+++ b/Documentation/CodingGuidelines
@@ -0,0 +1,134 @@
+Like other projects, we also have some guidelines to keep to the
+code. For git in general, three rough rules are:
+
+ - Most importantly, we never say "It's in POSIX; we'll happily
+ ignore your needs should your system not conform to it."
+ We live in the real world.
+
+ - However, we often say "Let's stay away from that construct,
+ it's not even in POSIX".
+
+ - In spite of the above two rules, we sometimes say "Although
+ this is not in POSIX, it (is so convenient | makes the code
+ much more readable | has other good characteristics) and
+ practically all the platforms we care about support it, so
+ let's use it".
+
+ Again, we live in the real world, and it is sometimes a
+ judgement call, the decision based more on real world
+ constraints people face than what the paper standard says.
+
+
+As for more concrete guidelines, just imitate the existing code
+(this is a good guideline, no matter which project you are
+contributing to). It is always preferable to match the _local_
+convention. New code added to git suite is expected to match
+the overall style of existing code. Modifications to existing
+code is expected to match the style the surrounding code already
+uses (even if it doesn't match the overall style of existing code).
+
+But if you must have a list of rules, here they are.
+
+For shell scripts specifically (not exhaustive):
+
+ - 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 ${parameter#word} and its [#%] siblings, and their
+ doubled "longest matching" form.
+
+ - We use Arithmetic Expansion $(( ... )).
+
+ - No "Substring Expansion" ${parameter:offset:length}.
+
+ - No shell arrays.
+
+ - No strlen ${#parameter}.
+
+ - No regexp ${parameter/pattern/string}.
+
+ - We do not use Process Substitution <(list) or >(list).
+
+ - We prefer "test" over "[ ... ]".
+
+ - We do not write the noiseword "function" in front of shell
+ functions.
+
+ - As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
+ [::], [==], nor [..]) for portability.
+
+ - We do not use \{m,n\};
+
+ - We do not use -E;
+
+ - We do not use ? nor + (which are \{0,1\} and \{1,\}
+ respectively in BRE) but that goes without saying as these
+ are ERE elements not BRE (note that \? and \+ are not even part
+ of BRE -- making them accessible from BRE is a GNU extension).
+
+For C programs:
+
+ - We use tabs to indent, and interpret tabs as taking up to
+ 8 spaces.
+
+ - We try to keep to at most 80 characters per line.
+
+ - When declaring pointers, the star sides with the variable
+ name, i.e. "char *string", not "char* string" or
+ "char * string". This makes it easier to understand code
+ like "char *string, c;".
+
+ - We avoid using braces unnecessarily. I.e.
+
+ if (bla) {
+ x = 1;
+ }
+
+ is frowned upon. A gray area is when the statement extends
+ over a few lines, and/or you have a lengthy comment atop of
+ it. Also, like in the Linux kernel, if there is a long list
+ of "else if" statements, it can make sense to add braces to
+ single line blocks.
+
+ - We try to avoid assignments inside if().
+
+ - Try to make your code understandable. You may put comments
+ in, but comments invariably tend to stale out when the code
+ they were describing changes. Often splitting a function
+ into two makes the intention of the code much clearer.
+
+ - Double negation is often harder to understand than no negation
+ at all.
+
+ - Some clever tricks, like using the !! operator with arithmetic
+ constructs, can be extremely confusing to others. Avoid them,
+ unless there is a compelling reason to use them.
+
+ - Use the API. No, really. We have a strbuf (variable length
+ string), several arrays with the ALLOC_GROW() macro, a
+ string_list for sorted string lists, a hash map (mapping struct
+ objects) named "struct decorate", amongst other things.
+
+ - When you come up with an API, document it.
+
+ - The first #include in C files, except in platform specific
+ compat/ implementations, should be git-compat-util.h or another
+ header file that includes it, such as cache.h or builtin.h.
+
+ - If you are planning a new command, consider writing it in shell
+ or perl first, so that changes in semantics can be easily
+ changed and discussed. Many git commands started out like
+ that, and a few are still scripts.
+
+ - Avoid introducing a new dependency into git. This means you
+ usually should stay away from scripting languages not already
+ used in the git core command set (unless your command is clearly
+ separate from it, such as an importer to convert random-scm-X
+ repositories to git).
+
+ - When we pass <string, length> pair to functions, we should try to
+ pass them in that order.
diff --git a/Documentation/Makefile b/Documentation/Makefile
new file mode 100644
index 0000000..e117bc4
--- /dev/null
+++ b/Documentation/Makefile
@@ -0,0 +1,344 @@
+MAN1_TXT= \
+ $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
+ $(wildcard git-*.txt)) \
+ gitk.txt git.txt
+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 gitrevisions.txt gitworkflows.txt
+
+MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
+MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
+MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
+
+DOC_HTML=$(MAN_HTML)
+
+ARTICLES = howto-index
+ARTICLES += everyday
+ARTICLES += git-tools
+ARTICLES += git-bisect-lk2009
+# with their own formatting rules.
+SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual
+API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
+SP_ARTICLES += $(API_DOCS)
+SP_ARTICLES += technical/api-index
+
+DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
+
+DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
+DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
+DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+
+prefix?=$(HOME)
+bindir?=$(prefix)/bin
+htmldir?=$(prefix)/share/doc/git-doc
+pdfdir?=$(prefix)/share/doc/git-doc
+mandir?=$(prefix)/share/man
+man1dir=$(mandir)/man1
+man5dir=$(mandir)/man5
+man7dir=$(mandir)/man7
+# DESTDIR=
+
+ASCIIDOC=asciidoc
+ASCIIDOC_EXTRA =
+MANPAGE_XSL = manpage-normal.xsl
+XMLTO_EXTRA =
+INSTALL?=install
+RM ?= rm -f
+DOC_REF = origin/man
+HTML_REF = origin/html
+
+infodir?=$(prefix)/share/info
+MAKEINFO=makeinfo
+INSTALL_INFO=install-info
+DOCBOOK2X_TEXI=docbook2x-texi
+DBLATEX=dblatex
+ifndef PERL_PATH
+ PERL_PATH = /usr/bin/perl
+endif
+
+-include ../config.mak.autogen
+-include ../config.mak
+
+#
+# For asciidoc ...
+# -7.1.2, no extra settings are needed.
+# 8.0-, set ASCIIDOC8.
+#
+
+#
+# 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.69.1-1.71.0, set DOCBOOK_SUPPRESS_SP?
+# 1.71.1, no extra settings are needed?
+# 1.72.0, set DOCBOOK_XSL_172.
+# 1.73.0-, set ASCIIDOC_NO_ROFF
+#
+
+#
+# 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
+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
+ # 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
+ endif
+endif
+ifdef MAN_BOLD_LITERAL
+XMLTO_EXTRA += -m manpage-bold-literal.xsl
+endif
+ifdef DOCBOOK_SUPPRESS_SP
+XMLTO_EXTRA += -m manpage-suppress-sp.xsl
+endif
+
+# Newer DocBook stylesheet emits warning cruft in the output when
+# this is not set, and if set it shows an absolute link. Older
+# stylesheets simply ignore this parameter.
+#
+# Distros may want to use MAN_BASE_URL=file:///path/to/git/docs/
+# or similar.
+ifndef MAN_BASE_URL
+MAN_BASE_URL = file://$(htmldir)/
+endif
+XMLTO_EXTRA += -m manpage-base-url.xsl
+
+# If your target system uses GNU groff, it may try to render
+# apostrophes as a "pretty" apostrophe using unicode. This breaks
+# cut&paste, so you should set GNU_ROFF to force them to be ASCII
+# apostrophes. Unfortunately does not work with non-GNU roff.
+ifdef GNU_ROFF
+XMLTO_EXTRA += -m manpage-quote-apos.xsl
+endif
+
+SHELL_PATH ?= $(SHELL)
+# Shell quote;
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+
+#
+# Please note that there is a minor bug in asciidoc.
+# The version after 6.0.3 _will_ include the patch found here:
+# http://marc.theaimsgroup.com/?l=git&m=111558757202243&w=2
+#
+# Until that version is released you may have to apply the patch
+# yourself - yes, all 6 characters of it!
+#
+
+QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1 =
+
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif
+
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifndef V
+ QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
+ QUIET_XMLTO = @echo ' ' XMLTO $@;
+ QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
+ QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
+ QUIET_DBLATEX = @echo ' ' DBLATEX $@;
+ QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
+ QUIET_GEN = @echo ' ' GEN $@;
+ QUIET_STDERR = 2> /dev/null
+ QUIET_SUBDIR0 = +@subdir=
+ QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
+ $(MAKE) $(PRINT_DIR) -C $$subdir
+ export V
+endif
+endif
+
+all: html man
+
+html: $(DOC_HTML)
+
+$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7): asciidoc.conf
+
+man: man1 man5 man7
+man1: $(DOC_MAN1)
+man5: $(DOC_MAN5)
+man7: $(DOC_MAN7)
+
+info: git.info gitman.info
+
+pdf: user-manual.pdf
+
+install: install-man
+
+install-man: man
+ $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
+ $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+ $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
+ $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
+
+install-info: info
+ $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
+ $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
+ if test -r $(DESTDIR)$(infodir)/dir; then \
+ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
+ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
+ else \
+ echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
+ fi
+
+install-pdf: pdf
+ $(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir)
+ $(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir)
+
+install-html: html
+ '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
+
+../GIT-VERSION-FILE: FORCE
+ $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
+
+-include ../GIT-VERSION-FILE
+
+#
+# Determine "include::" file references in asciidoc files.
+#
+doc.dep : $(wildcard *.txt) build-docdep.perl
+ $(QUIET_GEN)$(RM) $@+ $@ && \
+ $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
+ mv $@+ $@
+
+-include doc.dep
+
+cmds_txt = cmds-ancillaryinterrogators.txt \
+ cmds-ancillarymanipulators.txt \
+ cmds-mainporcelain.txt \
+ cmds-plumbinginterrogators.txt \
+ cmds-plumbingmanipulators.txt \
+ cmds-synchingrepositories.txt \
+ cmds-synchelpers.txt \
+ cmds-purehelpers.txt \
+ cmds-foreignscminterface.txt
+
+$(cmds_txt): cmd-list.made
+
+cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
+ $(QUIET_GEN)$(RM) $@ && \
+ $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \
+ date >$@
+
+clean:
+ $(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
+ $(RM) *.texi *.texi+ *.texi++ git.info gitman.info
+ $(RM) howto-index.txt howto/*.html doc.dep
+ $(RM) technical/api-*.html technical/api-index.txt
+ $(RM) $(cmds_txt) *.made
+ $(RM) manpage-base-url.xsl
+
+$(MAN_HTML): %.html : %.txt
+ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+ $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
+ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
+ mv $@+ $@
+
+manpage-base-url.xsl: manpage-base-url.xsl.in
+ sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
+
+%.1 %.5 %.7 : %.xml manpage-base-url.xsl
+ $(QUIET_XMLTO)$(RM) $@ && \
+ xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+
+%.xml : %.txt
+ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+ $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
+ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
+ mv $@+ $@
+
+user-manual.xml: user-manual.txt user-manual.conf
+ $(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))
+ $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh
+
+$(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
+ $(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
+ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt
+
+XSLT = docbook.xsl
+XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
+
+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
+
+user-manual.texi: user-manual.xml
+ $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
+ $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
+ $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
+ rm $@++ && \
+ mv $@+ $@
+
+user-manual.pdf: user-manual.xml
+ $(QUIET_DBLATEX)$(RM) $@+ $@ && \
+ $(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $< && \
+ mv $@+ $@
+
+gitman.texi: $(MAN_XML) cat-texi.perl
+ $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
+ ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \
+ --to-stdout $(xml) &&) true) > $@++ && \
+ $(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
+ rm $@++ && \
+ mv $@+ $@
+
+gitman.info: gitman.texi
+ $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
+
+$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
+ $(QUIET_DB2TEXI)$(RM) $@+ $@ && \
+ $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
+ mv $@+ $@
+
+howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
+ $(QUIET_GEN)$(RM) $@+ $@ && \
+ '$(SHELL_PATH_SQ)' ./howto-index.sh $(wildcard howto/*.txt) >$@+ && \
+ mv $@+ $@
+
+$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
+ $(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 $*.txt
+
+WEBDOC_DEST = /pub/software/scm/git/docs
+
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+ sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \
+ mv $@+ $@
+
+install-webdoc : html
+ '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)
+
+quick-install: quick-install-man
+
+quick-install-man:
+ '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
+
+quick-install-html:
+ '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
+
+.PHONY: FORCE
diff --git a/Documentation/RelNotes/1.5.0.1.txt b/Documentation/RelNotes/1.5.0.1.txt
new file mode 100644
index 0000000..fea3f99
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.1.txt
@@ -0,0 +1,42 @@
+GIT v1.5.0.1 Release Notes
+==========================
+
+Fixes since v1.5.0
+------------------
+
+* Documentation updates
+
+ - Clarifications and corrections to 1.5.0 release notes.
+
+ - The main documentation did not link to git-remote documentation.
+
+ - Clarified introductory text of git-rebase documentation.
+
+ - Converted remaining mentions of update-index on Porcelain
+ documents to git-add/git-rm.
+
+ - Some i18n.* configuration variables were incorrectly
+ described as core.*; fixed.
+
+* Bugfixes
+
+ - git-add and git-update-index on a filesystem on which
+ executable bits are unreliable incorrectly reused st_mode
+ bits even when the path changed between symlink and regular
+ file.
+
+ - git-daemon marks the listening sockets with FD_CLOEXEC so
+ that it won't be leaked into the children.
+
+ - segfault from git-blame when the mandatory pathname
+ parameter was missing was fixed; usage() message is given
+ instead.
+
+ - git-rev-list did not read $GIT_DIR/config file, which means
+ that did not honor i18n.logoutputencoding correctly.
+
+* Tweaks
+
+ - sliding mmap() inefficiently mmaped the same region of a
+ packfile with an access pattern that used objects in the
+ reverse order. This has been made more efficient.
diff --git a/Documentation/RelNotes/1.5.0.2.txt b/Documentation/RelNotes/1.5.0.2.txt
new file mode 100644
index 0000000..b061e50
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.2.txt
@@ -0,0 +1,65 @@
+GIT v1.5.0.2 Release Notes
+==========================
+
+Fixes since v1.5.0.1
+--------------------
+
+* Bugfixes
+
+ - Automated merge conflict handling when changes to symbolic
+ links conflicted were completely broken. The merge-resolve
+ strategy created a regular file with conflict markers in it
+ in place of the symbolic link. The default strategy,
+ merge-recursive was even more broken. It removed the path
+ that was pointed at by the symbolic link. Both of these
+ problems have been fixed.
+
+ - 'git diff maint master next' did not correctly give combined
+ diff across three trees.
+
+ - 'git fast-import' portability fix for Solaris.
+
+ - 'git show-ref --verify' without arguments did not error out
+ but segfaulted.
+
+ - 'git diff :tracked-file `pwd`/an-untracked-file' gave an extra
+ slashes after a/ and b/.
+
+ - 'git format-patch' produced too long filenames if the commit
+ message had too long line at the beginning.
+
+ - Running 'make all' and then without changing anything
+ running 'make install' still rebuilt some files. This
+ was inconvenient when building as yourself and then
+ installing as root (especially problematic when the source
+ directory is on NFS and root is mapped to nobody).
+
+ - 'git-rerere' failed to deal with two unconflicted paths that
+ sorted next to each other.
+
+ - 'git-rerere' attempted to open(2) a symlink and failed if
+ there was a conflict. Since a conflicting change to a
+ symlink would not benefit from rerere anyway, the command
+ now ignores conflicting changes to symlinks.
+
+ - 'git-repack' did not like to pass more than 64 arguments
+ internally to underlying 'rev-list' logic, which made it
+ impossible to repack after accumulating many (small) packs
+ in the repository.
+
+ - 'git-diff' to review the combined diff during a conflicted
+ merge were not reading the working tree version correctly
+ when changes to a symbolic link conflicted. It should have
+ read the data using readlink(2) but read from the regular
+ file the symbolic link pointed at.
+
+ - 'git-remote' did not like period in a remote's name.
+
+* Documentation updates
+
+ - added and clarified core.bare, core.legacyheaders configurations.
+
+ - updated "git-clone --depth" documentation.
+
+
+* Assorted git-gui fixes.
diff --git a/Documentation/RelNotes/1.5.0.3.txt b/Documentation/RelNotes/1.5.0.3.txt
new file mode 100644
index 0000000..cd500f9
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.3.txt
@@ -0,0 +1,58 @@
+GIT v1.5.0.3 Release Notes
+==========================
+
+Fixes since v1.5.0.2
+--------------------
+
+* Bugfixes
+
+ - 'git.el' honors the commit coding system from the configuration.
+
+ - 'blameview' in contrib/ correctly digs deeper when a line is
+ clicked.
+
+ - 'http-push' correctly makes sure the remote side has leading
+ path. Earlier it started in the middle of the path, and
+ incorrectly.
+
+ - 'git-merge' did not exit with non-zero status when the
+ working tree was dirty and cannot fast forward. It does
+ now.
+
+ - 'cvsexportcommit' does not lose yet-to-be-used message file.
+
+ - int-vs-size_t typefix when running combined diff on files
+ over 2GB long.
+
+ - 'git apply --whitespace=strip' should not touch unmodified
+ lines.
+
+ - 'git-mailinfo' choke when a logical header line was too long.
+
+ - 'git show A..B' did not error out. Negative ref ("not A" in
+ this example) does not make sense for the purpose of the
+ command, so now it errors out.
+
+ - 'git fmt-merge-msg --file' without file parameter did not
+ correctly error out.
+
+ - 'git archimport' barfed upon encountering a commit without
+ summary.
+
+ - 'git index-pack' did not protect itself from getting a short
+ read out of pread(2).
+
+ - 'git http-push' had a few buffer overruns.
+
+ - Build dependency fixes to rebuild fetch.o when other headers
+ change.
+
+* Documentation updates
+
+ - user-manual updates.
+
+ - Options to 'git remote add' were described insufficiently.
+
+ - Configuration format.suffix was not documented.
+
+ - Other formatting and spelling fixes.
diff --git a/Documentation/RelNotes/1.5.0.4.txt b/Documentation/RelNotes/1.5.0.4.txt
new file mode 100644
index 0000000..feefa5d
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.4.txt
@@ -0,0 +1,22 @@
+GIT v1.5.0.4 Release Notes
+==========================
+
+Fixes since v1.5.0.3
+--------------------
+
+* Bugfixes
+
+ - git.el does not add duplicate sign-off lines.
+
+ - git-commit shows the full stat of the resulting commit, not
+ just about the files in the current directory, when run from
+ a subdirectory.
+
+ - "git-checkout -m '@{8 hours ago}'" had a funny failure from
+ eval; fixed.
+
+ - git-gui updates.
+
+* Documentation updates
+
+* User manual updates
diff --git a/Documentation/RelNotes/1.5.0.5.txt b/Documentation/RelNotes/1.5.0.5.txt
new file mode 100644
index 0000000..eeec3d7
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.5.txt
@@ -0,0 +1,26 @@
+GIT v1.5.0.5 Release Notes
+==========================
+
+Fixes since v1.5.0.3
+--------------------
+
+* Bugfixes
+
+ - git-merge (hence git-pull) did not refuse fast-forwarding
+ when the working tree had local changes that would have
+ conflicted with it.
+
+ - git.el does not add duplicate sign-off lines.
+
+ - git-commit shows the full stat of the resulting commit, not
+ just about the files in the current directory, when run from
+ a subdirectory.
+
+ - "git-checkout -m '@{8 hours ago}'" had a funny failure from
+ eval; fixed.
+
+ - git-gui updates.
+
+* Documentation updates
+
+* User manual updates
diff --git a/Documentation/RelNotes/1.5.0.6.txt b/Documentation/RelNotes/1.5.0.6.txt
new file mode 100644
index 0000000..c02015a
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.6.txt
@@ -0,0 +1,21 @@
+GIT v1.5.0.6 Release Notes
+==========================
+
+Fixes since v1.5.0.5
+--------------------
+
+* Bugfixes
+
+ - a handful small fixes to gitweb.
+
+ - build procedure for user-manual is fixed not to require locally
+ installed stylesheets.
+
+ - "git commit $paths" on paths whose earlier contents were
+ already updated in the index were failing out.
+
+* Documentation
+
+ - user-manual has better cross references.
+
+ - gitweb installation/deployment procedure is now documented.
diff --git a/Documentation/RelNotes/1.5.0.7.txt b/Documentation/RelNotes/1.5.0.7.txt
new file mode 100644
index 0000000..670ad32
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.7.txt
@@ -0,0 +1,18 @@
+GIT v1.5.0.7 Release Notes
+==========================
+
+Fixes since v1.5.0.6
+--------------------
+
+* Bugfixes
+
+ - git-upload-pack failed to close unused pipe ends, resulting
+ in many zombies to hang around.
+
+ - git-rerere was recording the contents of earlier hunks
+ duplicated in later hunks. This prevented resolving the same
+ conflict when performing the same merge the other way around.
+
+* Documentation
+
+ - a few documentation fixes from Debian package maintainer.
diff --git a/Documentation/RelNotes/1.5.0.txt b/Documentation/RelNotes/1.5.0.txt
new file mode 100644
index 0000000..daf4bdb
--- /dev/null
+++ b/Documentation/RelNotes/1.5.0.txt
@@ -0,0 +1,469 @@
+GIT v1.5.0 Release Notes
+========================
+
+Old news
+--------
+
+This section is for people who are upgrading from ancient
+versions of git. Although all of the changes in this section
+happened before the current v1.4.4 release, they are summarized
+here in the v1.5.0 release notes for people who skipped earlier
+versions.
+
+As of git v1.5.0 there are some optional features that changes
+the repository to allow data to be stored and transferred more
+efficiently. These features are not enabled by default, as they
+will make the repository unusable with older versions of git.
+Specifically, the available options are:
+
+ - There is a configuration variable core.legacyheaders that
+ changes the format of loose objects so that they are more
+ efficient to pack and to send out of the repository over git
+ native protocol, since v1.4.2. However, loose objects
+ written in the new format cannot be read by git older than
+ that version; people fetching from your repository using
+ older clients over dumb transports (e.g. http) using older
+ versions of git will also be affected.
+
+ To let git use the new loose object format, you have to
+ set core.legacyheaders to false.
+
+ - Since v1.4.3, configuration repack.usedeltabaseoffset allows
+ packfile to be created in more space efficient format, which
+ cannot be read by git older than that version.
+
+ To let git use the new format for packfiles, you have to
+ set repack.usedeltabaseoffset to true.
+
+The above two new features are not enabled by default and you
+have to explicitly ask for them, because they make repositories
+unreadable by older versions of git, and in v1.5.0 we still do
+not enable them by default for the same reason. We will change
+this default probably 1 year after 1.4.2's release, when it is
+reasonable to expect everybody to have new enough version of
+git.
+
+ - 'git pack-refs' appeared in v1.4.4; this command allows tags
+ to be accessed much more efficiently than the traditional
+ 'one-file-per-tag' format. Older git-native clients can
+ still fetch from a repository that packed and pruned refs
+ (the server side needs to run the up-to-date version of git),
+ but older dumb transports cannot. Packing of refs is done by
+ an explicit user action, either by use of "git pack-refs
+ --prune" command or by use of "git gc" command.
+
+ - 'git -p' to paginate anything -- many commands do pagination
+ by default on a tty. Introduced between v1.4.1 and v1.4.2;
+ this may surprise old timers.
+
+ - 'git archive' superseded 'git tar-tree' in v1.4.3;
+
+ - 'git cvsserver' was new invention in v1.3.0;
+
+ - 'git repo-config', 'git grep', 'git rebase' and 'gitk' were
+ seriously enhanced during v1.4.0 timeperiod.
+
+ - 'gitweb' became part of git.git during v1.4.0 timeperiod and
+ seriously modified since then.
+
+ - reflog is an v1.4.0 invention. This allows you to name a
+ revision that a branch used to be at (e.g. "git diff
+ master@{yesterday} master" allows you to see changes since
+ yesterday's tip of the branch).
+
+
+Updates in v1.5.0 since v1.4.4 series
+-------------------------------------
+
+* Index manipulation
+
+ - git-add is to add contents to the index (aka "staging area"
+ for the next commit), whether the file the contents happen to
+ be is an existing one or a newly created one.
+
+ - git-add without any argument does not add everything
+ anymore. Use 'git-add .' instead. Also you can add
+ otherwise ignored files with an -f option.
+
+ - git-add tries to be more friendly to users by offering an
+ interactive mode ("git-add -i").
+
+ - git-commit <path> used to refuse to commit if <path> was
+ different between HEAD and the index (i.e. update-index was
+ used on it earlier). This check was removed.
+
+ - git-rm is much saner and safer. It is used to remove paths
+ from both the index file and the working tree, and makes sure
+ you are not losing any local modification before doing so.
+
+ - git-reset <tree> <paths>... can be used to revert index
+ entries for selected paths.
+
+ - git-update-index is much less visible. Many suggestions to
+ use the command in git output and documentation have now been
+ replaced by simpler commands such as "git add" or "git rm".
+
+
+* Repository layout and objects transfer
+
+ - The data for origin repository is stored in the configuration
+ file $GIT_DIR/config, not in $GIT_DIR/remotes/, for newly
+ created clones. The latter is still supported and there is
+ no need to convert your existing repository if you are
+ already comfortable with your workflow with the layout.
+
+ - git-clone always uses what is known as "separate remote"
+ layout for a newly created repository with a working tree.
+
+ A repository with the separate remote layout starts with only
+ one default branch, 'master', to be used for your own
+ development. Unlike the traditional layout that copied all
+ the upstream branches into your branch namespace (while
+ renaming their 'master' to your 'origin'), the new layout
+ puts upstream branches into local "remote-tracking branches"
+ with their own namespace. These can be referenced with names
+ such as "origin/$upstream_branch_name" and are stored in
+ .git/refs/remotes rather than .git/refs/heads where normal
+ branches are stored.
+
+ This layout keeps your own branch namespace less cluttered,
+ avoids name collision with your upstream, makes it possible
+ to automatically track new branches created at the remote
+ after you clone from it, and makes it easier to interact with
+ more than one remote repository (you can use "git remote" to
+ add other repositories to track). There might be some
+ surprises:
+
+ * 'git branch' does not show the remote tracking branches.
+ It only lists your own branches. Use '-r' option to view
+ the tracking branches.
+
+ * If you are forking off of a branch obtained from the
+ upstream, you would have done something like 'git branch
+ my-next next', because traditional layout dropped the
+ tracking branch 'next' into your own branch namespace.
+ With the separate remote layout, you say 'git branch next
+ origin/next', which allows you to use the matching name
+ 'next' for your own branch. It also allows you to track a
+ remote other than 'origin' (i.e. where you initially cloned
+ from) and fork off of a branch from there the same way
+ (e.g. "git branch mingw j6t/master").
+
+ Repositories initialized with the traditional layout continue
+ to work.