summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/RelNotes/1.9.3.txt21
-rw-r--r--Documentation/RelNotes/1.9.4.txt16
-rw-r--r--Documentation/RelNotes/2.0.0.txt99
-rw-r--r--Documentation/RelNotes/2.1.0.txt86
-rw-r--r--Documentation/config.txt19
-rw-r--r--Documentation/git-grep.txt3
-rw-r--r--Documentation/git-merge.txt5
-rw-r--r--Documentation/git-mergetool.txt8
-rw-r--r--Documentation/git-shell.txt2
-rw-r--r--Documentation/git-svn.txt3
-rw-r--r--Documentation/git-update-ref.txt18
-rw-r--r--Documentation/git.txt9
-rw-r--r--Documentation/technical/api-builtin.txt13
-rw-r--r--Documentation/technical/api-hashmap.txt1
-rw-r--r--Documentation/technical/api-strbuf.txt9
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile58
l---------RelNotes2
-rw-r--r--builtin/apply.c12
-rw-r--r--builtin/blame.c30
-rw-r--r--builtin/checkout.c2
-rw-r--r--builtin/clone.c9
-rw-r--r--builtin/commit.c92
-rw-r--r--builtin/index-pack.c27
-rw-r--r--builtin/merge.c8
-rw-r--r--builtin/notes.c6
-rw-r--r--builtin/rerere.c2
-rw-r--r--builtin/reset.c6
-rw-r--r--builtin/tag.c90
-rw-r--r--builtin/update-ref.c426
-rw-r--r--cache.h25
-rw-r--r--combine-diff.c168
-rw-r--r--compat/mmap.c4
-rw-r--r--compat/win32/alloca.h (renamed from compat/vcbuild/include/alloca.h)0
-rw-r--r--config.c16
-rw-r--r--config.mak.uname18
-rw-r--r--configure.ac8
-rw-r--r--contrib/completion/git-prompt.sh72
-rw-r--r--contrib/examples/builtin-fetch--tool.c3
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki.perl7
-rwxr-xr-xcontrib/mw-to-git/t/install-wiki.sh10
-rwxr-xr-xcontrib/mw-to-git/t/t9363-mw-to-git-export-import.sh19
-rwxr-xr-xcontrib/mw-to-git/t/t9365-continuing-queries.sh2
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw-lib.sh8
-rw-r--r--contrib/remote-helpers/Makefile14
-rw-r--r--contrib/remote-helpers/README15
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr986
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg1261
-rwxr-xr-xcontrib/remote-helpers/test-bzr.sh438
-rwxr-xr-xcontrib/remote-helpers/test-hg-bidi.sh243
-rwxr-xr-xcontrib/remote-helpers/test-hg-hg-git.sh542
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh848
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh2
-rwxr-xr-xcontrib/thunderbird-patch-inline/appp.sh14
-rw-r--r--diff.c68
-rw-r--r--diff.h11
-rw-r--r--git-compat-util.h9
-rwxr-xr-xgit-gui/git-gui.sh4
-rwxr-xr-xgit-mergetool.sh14
-rwxr-xr-xgit-p4.py2
-rwxr-xr-xgit-pull.sh2
-rw-r--r--git-rebase--merge.sh4
-rwxr-xr-xgit-rebase.sh8
-rwxr-xr-xgit-request-pull.sh6
-rwxr-xr-xgit-send-email.perl16
-rw-r--r--git-sh-setup.sh2
-rwxr-xr-xgit-stash.sh2
-rwxr-xr-xgit-web--browse.sh6
-rw-r--r--git.c2
-rw-r--r--grep.c5
-rw-r--r--mergetools/gvimdiff31
-rw-r--r--mergetools/vimdiff14
-rw-r--r--mergetools/vimdiff31
-rw-r--r--notes-cache.c2
-rw-r--r--notes-utils.c3
-rw-r--r--pager.c4
-rw-r--r--perl/Git/SVN.pm2
-rw-r--r--perl/Git/SVN/Log.pm2
-rw-r--r--po/bg.po5033
-rw-r--r--po/de.po2771
-rw-r--r--po/fr.po2791
-rw-r--r--po/git.pot2527
-rw-r--r--po/sv.po2722
-rw-r--r--po/vi.po2843
-rw-r--r--po/zh_CN.po2705
-rw-r--r--pretty.c4
-rw-r--r--read-cache.c47
-rw-r--r--refs.c195
-rw-r--r--refs.h94
-rw-r--r--sequencer.c4
-rw-r--r--setup.c4
-rw-r--r--strbuf.c11
-rwxr-xr-xt/lib-credential.sh2
-rw-r--r--t/lib-cvs.sh2
-rwxr-xr-xt/lib-gpg.sh2
-rwxr-xr-xt/perf/p5302-pack-index.sh2
-rwxr-xr-xt/t0001-init.sh12
-rwxr-xr-xt/t0010-racy-git.sh4
-rwxr-xr-xt/t0020-crlf.sh42
-rwxr-xr-xt/t0025-crlf-auto.sh38
-rwxr-xr-xt/t0026-eol-config.sh20
-rwxr-xr-xt/t0030-stripspace.sh20
-rwxr-xr-xt/t0300-credentials.sh2
-rwxr-xr-xt/t1000-read-tree-m-3way.sh4
-rwxr-xr-xt/t1001-read-tree-m-2way.sh18
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh10
-rwxr-xr-xt/t1003-read-tree-prefix.sh2
-rwxr-xr-xt/t1004-read-tree-m-u-wf.sh8
-rwxr-xr-xt/t1020-subdirectory.sh22
-rwxr-xr-xt/t1050-large.sh4
-rwxr-xr-xt/t1300-repo-config.sh10
-rwxr-xr-xt/t1400-update-ref.sh100
-rwxr-xr-xt/t3508-cherry-pick-many-commits.sh6
-rwxr-xr-xt/t3905-stash-include-untracked.sh4
-rwxr-xr-xt/t3910-mac-os-precompose.sh16
-rwxr-xr-xt/t4006-diff-mode.sh2
-rwxr-xr-xt/t4010-diff-pathspec.sh4
-rwxr-xr-xt/t4012-diff-binary.sh16
-rwxr-xr-xt/t4013-diff-various.sh6
-rwxr-xr-xt/t4014-format-patch.sh10
-rwxr-xr-xt/t4036-format-patch-signer-mime.sh2
-rwxr-xr-xt/t4038-diff-combined.sh2
-rwxr-xr-xt/t4057-diff-combined-paths.sh2
-rwxr-xr-xt/t4107-apply-ignore-whitespace.sh12
-rwxr-xr-xt/t4116-apply-reverse.sh12
-rwxr-xr-xt/t4119-apply-config.sh2
-rwxr-xr-xt/t4204-patch-id.sh4
-rwxr-xr-xt/t5000-tar-tree.sh6
-rwxr-xr-xt/t5150-request-pull.sh8
-rwxr-xr-xt/t5537-fetch-shallow.sh28
-rwxr-xr-xt/t7004-tag.sh26
-rwxr-xr-xt/t7500-commit.sh11