summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--Documentation/RelNotes/1.7.4.txt54
-rw-r--r--Documentation/config.txt11
-rw-r--r--Documentation/diff-options.txt35
-rw-r--r--Documentation/git-archimport.txt2
-rw-r--r--Documentation/git-cvsexportcommit.txt4
-rw-r--r--Documentation/git-cvsserver.txt4
-rw-r--r--Documentation/git-daemon.txt1
-rw-r--r--Documentation/git-fast-import.txt3
-rw-r--r--Documentation/git-fmt-merge-msg.txt16
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-merge.txt14
-rw-r--r--Documentation/git-pull.txt14
-rw-r--r--Documentation/git-read-tree.txt6
-rw-r--r--Documentation/git-repack.txt6
-rw-r--r--Documentation/git-reset.txt76
-rw-r--r--Documentation/git-send-email.txt17
-rw-r--r--Documentation/git-shell.txt28
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/gitattributes.txt15
-rw-r--r--Documentation/gitdiffcore.txt6
-rw-r--r--Documentation/merge-config.txt6
-rw-r--r--Documentation/merge-options.txt6
-rw-r--r--Documentation/merge-strategies.txt26
-rw-r--r--Documentation/rev-list-options.txt5
-rw-r--r--Documentation/technical/api-merge.txt71
-rw-r--r--Documentation/technical/api-sigchain.txt41
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL8
-rw-r--r--Makefile8
l---------RelNotes2
-rw-r--r--abspath.c6
-rw-r--r--attr.c52
-rw-r--r--builtin.h9
-rw-r--r--builtin/apply.c6
-rw-r--r--builtin/blame.c33
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/checkout.c2
-rw-r--r--builtin/clean.c8
-rw-r--r--builtin/commit-tree.c12
-rw-r--r--builtin/fmt-merge-msg.c60
-rw-r--r--builtin/log.c7
-rw-r--r--builtin/merge-file.c7
-rw-r--r--builtin/merge-recursive.c15
-rw-r--r--builtin/merge.c52
-rw-r--r--builtin/read-tree.c10
-rw-r--r--builtin/rev-list.c6
-rw-r--r--builtin/revert.c2
-rw-r--r--builtin/send-pack.c5
-rw-r--r--compat/mingw.c56
-rw-r--r--compat/mingw.h36
-rw-r--r--config.c4
-rw-r--r--configure.ac10
-rwxr-xr-xcontrib/ciabot/ciabot.py2
-rwxr-xr-xcontrib/completion/git-completion.bash159
-rw-r--r--contrib/emacs/git-blame.el1
-rwxr-xr-xcontrib/examples/git-svnimport.perl4
-rwxr-xr-xcontrib/fast-import/git-p44
-rwxr-xr-xcontrib/fast-import/import-directories.perl3
-rw-r--r--contrib/git-shell-commands/README18
-rwxr-xr-xcontrib/git-shell-commands/help18
-rwxr-xr-xcontrib/git-shell-commands/list10
-rwxr-xr-xcontrib/hooks/post-receive-email47
-rw-r--r--daemon.c80
-rw-r--r--diff.c55
-rw-r--r--diff.h5
-rw-r--r--diffcore-pickaxe.c152
-rw-r--r--diffcore.h2
-rw-r--r--dir.c3
-rw-r--r--fast-import.c9
-rwxr-xr-xgit-add--interactive.perl4
-rwxr-xr-xgit-am.sh12
-rwxr-xr-xgit-archimport.perl3
-rwxr-xr-xgit-bisect.sh14
-rwxr-xr-xgit-cvsexportcommit.perl4
-rwxr-xr-xgit-cvsimport.perl5
-rwxr-xr-xgit-cvsserver.perl7
-rwxr-xr-xgit-difftool.perl1
-rwxr-xr-xgit-gui/git-gui.sh77
-rw-r--r--git-gui/lib/branch_rename.tcl2
-rw-r--r--git-gui/lib/diff.tcl34
-rwxr-xr-xgit-merge-octopus.sh5
-rw-r--r--git-mergetool--lib.sh26
-rwxr-xr-xgit-rebase.sh4
-rwxr-xr-xgit-relink.perl2
-rwxr-xr-xgit-repack.sh11
-rwxr-xr-xgit-send-email.perl171
-rw-r--r--git-sh-setup.sh18
-rwxr-xr-xgit-submodule.sh26
-rwxr-xr-xgit-svn.perl1
-rw-r--r--gitweb/Makefile16
-rw-r--r--gitweb/README11
-rwxr-xr-xgitweb/gitweb.perl27
-rw-r--r--grep.c102
-rw-r--r--grep.h2
-rw-r--r--ll-merge.c51
-rw-r--r--ll-merge.h22
-rw-r--r--mailmap.c10
-rw-r--r--merge-file.c2
-rw-r--r--merge-recursive.c58
-rw-r--r--merge-recursive.h4
-rw-r--r--perl/Git.pm1
-rw-r--r--rerere.c2
-rw-r--r--send-pack.h1
-rw-r--r--setup.c4
-rw-r--r--sha1_name.c2
-rw-r--r--shell.c133
-rw-r--r--strbuf.c2
-rw-r--r--t/Makefile14
-rw-r--r--t/README6
-rw-r--r--t/gitweb-lib.sh33
-rw-r--r--t/lib-terminal.sh19
-rwxr-xr-xt/t0003-attributes.sh13
-rwxr-xr-xt/t1011-read-tree-sparse-checkout.sh10
-rwxr-xr-xt/t1300-repo-config.sh35
-rwxr-xr-xt/t3032-merge-recursive-options.sh186
-rwxr-xr-xt/t3402-rebase-merge.sh21
-rwxr-xr-xt/t3419-rebase-patch-id.sh109
-rwxr-xr-xt/t3506-cherry-pick-ff.sh10
-rwxr-xr-xt/t4011-diff-symlink.sh26
-rwxr-xr-xt/t4012-diff-binary.sh4
-rwxr-xr-xt/t4013-diff-various.sh3
-rw-r--r--t/t4013/diff.log_-GF_-p_--pickaxe-all_master27
-rw-r--r--t/t4013/diff.log_-GF_-p_master18
-rw-r--r--t/t4013/diff.log_-GF_master7
-rwxr-xr-xt/t4014-format-patch.sh21
-rwxr-xr-xt/t4015-diff-whitespace.sh37
-rwxr-xr-xt/t4018-diff-funcname.sh2
-rwxr-xr-xt/t4034-diff-words.sh72
-rwxr-xr-xt/t4041-diff-submodule-option.sh96
-rwxr-xr-xt/t4103-apply-binary.sh27
-rwxr-xr-xt/t4203-mailmap.sh67