summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Documentation/RelNotes/1.8.1.txt151
-rw-r--r--Documentation/SubmittingPatches3
-rw-r--r--Documentation/config.txt8
-rw-r--r--Documentation/diff-config.txt4
-rw-r--r--Documentation/git-commit.txt22
-rw-r--r--Documentation/git-cvsimport.txt8
-rw-r--r--Documentation/git-format-patch.txt14
-rw-r--r--Documentation/git-notes.txt4
-rw-r--r--Documentation/git-remote-helpers.txt21
-rw-r--r--Documentation/git-reset.txt8
-rw-r--r--Documentation/git-rm.txt15
-rw-r--r--Documentation/git-send-email.txt4
-rw-r--r--Documentation/git-status.txt3
-rw-r--r--Documentation/git-submodule.txt7
-rw-r--r--Documentation/git-svn.txt7
-rw-r--r--Documentation/git-symbolic-ref.txt10
-rw-r--r--Documentation/gitattributes.txt1
-rw-r--r--Documentation/gitmodules.txt4
-rw-r--r--Documentation/rev-list-options.txt10
-rw-r--r--Documentation/technical/api-argv-array.txt8
-rw-r--r--Documentation/technical/api-strbuf.txt16
-rw-r--r--Documentation/technical/api-string-list.txt9
-rw-r--r--Documentation/user-manual.txt7
-rw-r--r--Makefile12
l---------RelNotes2
-rw-r--r--argv-array.c20
-rw-r--r--argv-array.h2
-rw-r--r--attr.c71
-rw-r--r--bisect.c38
-rw-r--r--bisect.h4
-rw-r--r--builtin.h4
-rw-r--r--builtin/blame.c5
-rw-r--r--builtin/commit.c29
-rw-r--r--builtin/describe.c2
-rw-r--r--builtin/diff.c16
-rw-r--r--builtin/fetch-pack.c950
-rw-r--r--builtin/log.c8
-rw-r--r--builtin/mailinfo.c3
-rw-r--r--builtin/merge.c106
-rw-r--r--builtin/pack-objects.c1
-rw-r--r--builtin/rev-list.c49
-rw-r--r--builtin/rm.c125
-rw-r--r--builtin/send-pack.c333
-rw-r--r--builtin/show-ref.c23
-rw-r--r--builtin/symbolic-ref.c33
-rw-r--r--cache.h12
-rw-r--r--commit.c10
-rw-r--r--commit.h8
-rw-r--r--compat/mingw.c22
-rw-r--r--compat/mingw.h3
-rw-r--r--configure.ac4
-rw-r--r--contrib/completion/git-completion.bash35
-rw-r--r--contrib/svn-fe/svn-fe.c3
-rwxr-xr-xcontrib/svn-fe/svnrdump_sim.py53
-rw-r--r--diff.c65
-rw-r--r--diff.h1
-rw-r--r--diffcore-pickaxe.c4
-rw-r--r--dir.c192
-rw-r--r--dir.h13
-rw-r--r--fetch-pack.c951
-rw-r--r--git-compat-util.h2
-rwxr-xr-xgit-cvsimport.perl35
-rwxr-xr-xgit-cvsserver.perl548
-rwxr-xr-xgit-filter-branch.sh46
-rw-r--r--git-parse-remote.sh2
-rwxr-xr-xgit-send-email.perl31
-rw-r--r--git-sh-setup.sh62
-rwxr-xr-xgit-submodule.sh64
-rw-r--r--git.c33
-rw-r--r--http.c6
-rw-r--r--http.h3
-rw-r--r--log-tree.c51
-rw-r--r--mailmap.c2
-rw-r--r--merge-recursive.h5
-rw-r--r--merge.c112
-rw-r--r--notes.c76
-rw-r--r--notes.h6
-rw-r--r--pager.c52
-rw-r--r--pretty.c173
-rw-r--r--refs.c33
-rw-r--r--remote-curl.c17
-rw-r--r--remote-testsvn.c342
-rw-r--r--remote.c4
-rw-r--r--revision.c6
-rw-r--r--revision.h1
-rw-r--r--run-command.c10
-rw-r--r--run-command.h1
-rw-r--r--send-pack.c344
-rw-r--r--sequencer.c4
-rw-r--r--strbuf.c43
-rw-r--r--strbuf.h48
-rw-r--r--string-list.c9
-rw-r--r--string-list.h7
-rw-r--r--submodule.c80
-rw-r--r--submodule.h2
-rwxr-xr-xt/t0003-attributes.sh10
-rwxr-xr-xt/t1401-symbolic-ref.sh30
-rwxr-xr-xt/t3001-ls-files-others-exclude.sh6
-rwxr-xr-xt/t3600-rm.sh343
-rwxr-xr-xt/t4014-format-patch.sh246
-rwxr-xr-xt/t4030-diff-textconv.sh12
-rwxr-xr-xt/t4055-diff-context.sh92
-rwxr-xr-xt/t4202-log.sh4
-rwxr-xr-xt/t7003-filter-branch.sh5
-rwxr-xr-xt/t7400-submodule-basic.sh75
-rwxr-xr-xt/t7403-submodule-sync.sh55
-rwxr-xr-xt/t7406-submodule-update.sh2
-rwxr-xr-xt/t7407-submodule-foreach.sh4
-rwxr-xr-xt/t9001-send-email.sh86
-rwxr-xr-xt/t9020-remote-svn.sh84
-rwxr-xr-xt/t9200-git-cvsexportcommit.sh2
-rwxr-xr-xt/t9400-git-cvsserver-server.sh72
-rwxr-xr-xt/t9401-git-cvsserver-crlf.sh35
-rwxr-xr-xt/t9604-cvsimport-timestamps.sh71
-rw-r--r--t/t9604/cvsroot/.gitattributes1
-rw-r--r--t/t9604/cvsroot/CVSROOT/.gitignore2
-rw-r--r--t/t9604/cvsroot/module/a,v264
-rwxr-xr-xt/t9902-completion.sh5
-rw-r--r--test-svn-fe.c2
-rw-r--r--transport-helper.c44
-rw-r--r--transport.h5
-rw-r--r--tree-walk.c8
-rw-r--r--upload-pack.c14
-rw-r--r--utf8.c9
-rw-r--r--utf8.h1
-rw-r--r--vcs-svn/fast_export.c36
-rw-r--r--vcs-svn/fast_export.h8
-rw-r--r--vcs-svn/svndump.c61
-rw-r--r--vcs-svn/svndump.h3
-rw-r--r--write_or_die.c7
131 files changed, 5146 insertions, 2375 deletions
diff --git a/.gitignore b/.gitignore
index a188a82bb1..f702415c12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@
/git-remote-fd
/git-remote-ext
/git-remote-testgit
+/git-remote-testsvn
/git-repack
/git-replace
/git-repo-config
diff --git a/Documentation/RelNotes/1.8.1.txt b/Documentation/RelNotes/1.8.1.txt
new file mode 100644
index 0000000000..107e5f3d50
--- /dev/null
+++ b/