summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore5
-rw-r--r--Documentation/Makefile18
-rw-r--r--Documentation/RelNotes/1.7.12.txt172
-rw-r--r--Documentation/config.txt43
-rw-r--r--Documentation/git-apply.txt11
-rw-r--r--Documentation/git-clone.txt19
-rw-r--r--Documentation/git-commit.txt8
-rw-r--r--Documentation/git-config.txt17
-rw-r--r--Documentation/git-credential.txt144
-rw-r--r--Documentation/git-daemon.txt2
-rw-r--r--Documentation/git-p4.txt10
-rw-r--r--Documentation/git-rebase.txt52
-rw-r--r--Documentation/git-rev-parse.txt6
-rw-r--r--Documentation/gitattributes.txt2
-rw-r--r--Documentation/gitignore.txt4
-rw-r--r--Documentation/technical/api-credentials.txt39
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile264
l---------RelNotes2
-rw-r--r--attr.c17
-rw-r--r--branch.c38
-rw-r--r--builtin.h5
-rw-r--r--builtin/apply.c559
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/clone.c10
-rw-r--r--builtin/commit-tree.c8
-rw-r--r--builtin/config.c35
-rw-r--r--builtin/credential.c31
-rw-r--r--builtin/help.c25
-rw-r--r--builtin/index-pack.c199
-rw-r--r--builtin/init-db.c1
-rw-r--r--builtin/log.c4
-rw-r--r--builtin/pack-objects.c75
-rw-r--r--builtin/reflog.c6
-rw-r--r--builtin/reset.c10
-rw-r--r--builtin/rev-parse.c14
-rw-r--r--cache.h32
-rw-r--r--commit.c2
-rw-r--r--compat/precompose_utf8.c190
-rw-r--r--compat/precompose_utf8.h45
-rw-r--r--config.c28
-rw-r--r--config.mak.in1
-rw-r--r--configure.ac7
-rw-r--r--connect.c20
-rw-r--r--[-rwxr-xr-x]contrib/completion/git-completion.bash262
-rw-r--r--contrib/completion/git-prompt.sh289
-rw-r--r--contrib/emacs/git-blame.el75
-rw-r--r--contrib/mw-to-git/Makefile47
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki708
-rw-r--r--contrib/mw-to-git/t/.gitignore4
-rw-r--r--contrib/mw-to-git/t/Makefile31
-rw-r--r--contrib/mw-to-git/t/README124
-rwxr-xr-xcontrib/mw-to-git/t/install-wiki.sh45
-rw-r--r--contrib/mw-to-git/t/install-wiki/.gitignore1
-rw-r--r--contrib/mw-to-git/t/install-wiki/LocalSettings.php129
-rw-r--r--contrib/mw-to-git/t/install-wiki/db_install.php120
-rw-r--r--contrib/mw-to-git/t/push-pull-tests.sh144
-rwxr-xr-xcontrib/mw-to-git/t/t9360-mw-to-git-clone.sh257
-rwxr-xr-xcontrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh24
-rwxr-xr-xcontrib/mw-to-git/t/t9362-mw-to-git-utf8.sh301
-rwxr-xr-xcontrib/mw-to-git/t/t9363-mw-to-git-export-import.sh198
-rwxr-xr-xcontrib/mw-to-git/t/t9364-pull-by-rev.sh17
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw-lib.sh435
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw.pl225
-rw-r--r--contrib/mw-to-git/t/test.config35
-rw-r--r--credential.c2
-rw-r--r--credential.h1
-rw-r--r--date.c2
-rw-r--r--dir.c150
-rw-r--r--dir.h2
-rw-r--r--environment.c1
-rwxr-xr-xgit-am.sh53
-rw-r--r--git-compat-util.h9
-rwxr-xr-xgit-filter-branch.sh2
-rwxr-xr-xgit-p4.py274
-rw-r--r--git-rebase--am.sh2
-rw-r--r--git-rebase--interactive.sh59
-rw-r--r--git-rebase--merge.sh2
-rwxr-xr-xgit-rebase.sh38
-rwxr-xr-xgit-submodule.sh66
-rwxr-xr-xgit-svn.perl9
-rw-r--r--git.c3
-rw-r--r--help.c1
-rw-r--r--http.c3
-rw-r--r--notes-merge.c6
-rw-r--r--parse-options.c1
-rw-r--r--path.c41
-rw-r--r--perl/Makefile16
-rw-r--r--pkt-line.c32
-rw-r--r--pkt-line.h1
-rw-r--r--po/de.po569
-rw-r--r--po/git.pot537
-rw-r--r--po/sv.po545
-rw-r--r--po/vi.po600
-rw-r--r--po/zh_CN.po566
-rw-r--r--read-cache.c4
-rw-r--r--rerere.c12
-rw-r--r--revision.c77
-rw-r--r--revision.h5
-rw-r--r--setup.c8
-rw-r--r--sha1_name.c494
-rw-r--r--t/lib-bash.sh18
-rwxr-xr-xt/lib-credential.sh39
-rw-r--r--t/lib-git-p4.sh60
-rwxr-xr-xt/t0300-credentials.sh14
-rwxr-xr-xt/t1050-large.sh17
-rwxr-xr-xt/t1304-default-acl.sh19
-rwxr-xr-xt/t1306-xdg-files.sh158
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh264
-rwxr-xr-xt/t3404-rebase-interactive.sh148
-rwxr-xr-xt/t3405-rebase-malformed.sh32
-rwxr-xr-xt/t3412-rebase-root.sh7
-rwxr-xr-xt/t3910-mac-os-precompose.sh164
-rwxr-xr-xt/t4012-diff-binary.sh94
-rwxr-xr-xt/t4108-apply-threeway.sh157
-rwxr-xr-xt/t4117-apply-reject.sh8
-rwxr-xr-xt/t5300-pack-object.sh5
-rwxr-xr-xt/t5512-ls-remote.sh16
-rwxr-xr-xt/t5701-clone-local.sh10
-rwxr-xr-xt/t7003-filter-branch.sh3
-rwxr-xr-xt/t7060-wtstatus.sh96
-rwxr-xr-xt/t7400-submodule-basic.sh149
-rwxr-xr-xt/t7403-submodule-sync.sh90
-rwxr-xr-xt/t7406-submodule-update.sh13
-rwxr-xr-xt/t7512-status-help.sh649
-rwxr-xr-xt/t9800-git-p4-basic.sh421
-rwxr-xr-xt/t9805-git-p4-skip-submit-edit.sh9
-rwxr-xr-xt/t9806-git-p4-options.sh17
-rwxr-xr-xt/t9807-git-p4-submit.sh155
-rwxr-xr-xt/t9808-git-p4-chdir.sh4
-rwxr-xr-xt/t9810-git-p4-rcs.sh8
-rwxr-xr-xt/t9812-git-p4-wildcards.sh147