summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Documentation/CodingGuidelines9
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt48
-rw-r--r--Documentation/RelNotes-1.6.1.2.txt39
-rw-r--r--Documentation/RelNotes-1.6.2.txt80
-rw-r--r--Documentation/config.txt16
-rw-r--r--Documentation/diff-options.txt23
-rw-r--r--Documentation/git-am.txt9
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/git-cherry.txt3
-rw-r--r--Documentation/git-describe.txt4
-rw-r--r--Documentation/git-diff-files.txt5
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-ls-tree.txt10
-rw-r--r--Documentation/git-mergetool.txt6
-rw-r--r--Documentation/git-push.txt19
-rw-r--r--Documentation/git-rebase.txt21
-rw-r--r--Documentation/git-rev-parse.txt3
-rw-r--r--Documentation/git-shell.txt5
-rw-r--r--Documentation/git-shortlog.txt2
-rw-r--r--Documentation/git-svn.txt24
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/gitattributes.txt21
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/githooks.txt4
-rw-r--r--Documentation/gittutorial-2.txt4
-rw-r--r--Documentation/gittutorial.txt4
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt2
-rw-r--r--Documentation/pretty-formats.txt1
-rw-r--r--Documentation/pretty-options.txt2
-rw-r--r--Documentation/technical/api-run-command.txt15
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile26
-rw-r--r--builtin-add.c28
-rw-r--r--builtin-apply.c271
-rw-r--r--builtin-checkout.c43
-rw-r--r--builtin-clone.c26
-rw-r--r--builtin-commit.c47
-rw-r--r--builtin-count-objects.c5
-rw-r--r--builtin-fsck.c16
-rw-r--r--builtin-gc.c38
-rw-r--r--builtin-grep.c15
-rw-r--r--builtin-log.c51
-rw-r--r--builtin-ls-files.c40
-rw-r--r--builtin-ls-tree.c7
-rw-r--r--builtin-merge.c31
-rw-r--r--builtin-mv.c1
-rw-r--r--builtin-pack-objects.c6
-rw-r--r--builtin-prune.c14
-rw-r--r--builtin-receive-pack.c6
-rw-r--r--builtin-rerere.c11
-rw-r--r--builtin-send-pack.c43
-rw-r--r--builtin-shortlog.c28
-rw-r--r--builtin-unpack-objects.c6
-rw-r--r--bundle.c34
-rw-r--r--cache.h13
-rw-r--r--color.c59
-rw-r--r--color.h4
-rw-r--r--config.mak.in1
-rw-r--r--configure.ac28
-rwxr-xr-xcontrib/completion/git-completion.bash100
-rwxr-xr-xcontrib/difftool/git-difftool73
-rwxr-xr-xcontrib/difftool/git-difftool-helper240
-rw-r--r--contrib/difftool/git-difftool.txt105
-rw-r--r--contrib/examples/README3
-rw-r--r--contrib/vim/README12
-rw-r--r--ctype.c33
-rw-r--r--diff-lib.c40
-rw-r--r--diff-no-index.c28
-rw-r--r--diff.c231
-rw-r--r--diff.h1
-rw-r--r--diffcore-rename.c9
-rw-r--r--dir.c54
-rw-r--r--dir.h9
-rw-r--r--entry.c39
-rw-r--r--fast-import.c7
-rwxr-xr-xgit-am.sh34
-rwxr-xr-xgit-bisect.sh2
-rw-r--r--git-compat-util.h6
-rwxr-xr-xgit-cvsserver.perl25
-rwxr-xr-xgit-mergetool.sh27
-rwxr-xr-xgit-rebase--interactive.sh121
-rwxr-xr-xgit-rebase.sh56
-rwxr-xr-xgit-sh-setup.sh2
-rwxr-xr-xgit-svn.perl201
-rw-r--r--git.c53
-rw-r--r--gitweb/README76
-rwxr-xr-xgitweb/gitweb.perl172
-rw-r--r--grep.c34
-rw-r--r--grep.h1
-rw-r--r--http-push.c92
-rw-r--r--http-walker.c8
-rw-r--r--index-pack.c12
-rw-r--r--object.c19
-rw-r--r--object.h1
-rw-r--r--perl/Git.pm11
-rw-r--r--pretty.c16
-rw-r--r--refs.c17
-rw-r--r--refs.h1
-rw-r--r--remote.c6
-rw-r--r--revision.c1
-rw-r--r--run-command.c45
-rw-r--r--run-command.h2
-rw-r--r--setup.c6
-rw-r--r--sha1_file.c34
-rw-r--r--sha1_name.c129
-rw-r--r--symlinks.c263
-rw-r--r--t/README18
-rw-r--r--t/lib-httpd.sh10
-rw-r--r--t/lib-httpd/apache.conf2
-rw-r--r--t/lib-rebase.sh48
-rwxr-xr-xt/t0070-fundamental.sh15
-rwxr-xr-xt/t1001-read-tree-m-2way.sh51
-rwxr-xr-xt/t1501-worktree.sh7
-rwxr-xr-xt/t1505-rev-parse-last.sh69
-rwxr-xr-xt/t2012-checkout-last.sh94
-rwxr-xr-xt/t2300-cd-to-toplevel.sh4
-rwxr-xr-xt/t3404-rebase-interactive.sh69
-rwxr-xr-xt/t3409-rebase-hook.sh6
-rwxr-xr-xt/t3410-rebase-preserve-dropped-merges.sh124
-rwxr-xr-x[-rw-r--r--]t/t3411-rebase-preserve-around-merges.sh103
-rwxr-xr-xt/t3412-rebase-root.sh271
-rwxr-xr-xt/t3501-revert-cherry-pick.sh2
-rwxr-xr-xt/t4011-diff-symlink.sh7
-rwxr-xr-xt/t4013-diff-various.sh1
-rw-r--r--t/t4013/diff.diff_--no-index_--name-status_--_dir2_dir3
-rwxr-xr-xt/t4014-format-patch.sh52
-rwxr-xr-xt/t4015-diff-whitespace.sh27
-rwxr-xr-xt/t4029-diff-trailing-space.sh8
-rwxr-xr-xt/t4033-diff-patience.sh168
-rwxr-xr-xt/t4034-diff-words.sh200
-rwxr-xr-x