summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Documentation/CodingGuidelines150
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/1.9.4.txt16
-rw-r--r--Documentation/RelNotes/2.1.0.txt200
-rw-r--r--Documentation/config.txt38
-rw-r--r--Documentation/diff-config.txt2
-rw-r--r--Documentation/git-bisect.txt2
-rw-r--r--Documentation/git-config.txt2
-rw-r--r--Documentation/git-daemon.txt6
-rw-r--r--Documentation/git-fast-export.txt4
-rw-r--r--Documentation/git-fast-import.txt13
-rw-r--r--Documentation/git-grep.txt3
-rw-r--r--Documentation/git-help.txt12
-rw-r--r--Documentation/git-ls-files.txt6
-rw-r--r--Documentation/git-merge.txt5
-rw-r--r--Documentation/git-mergetool.txt8
-rw-r--r--Documentation/git-patch-id.txt37
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-replace.txt16
-rw-r--r--Documentation/git-send-email.txt6
-rw-r--r--Documentation/git-svn.txt4
-rw-r--r--Documentation/git-update-ref.txt18
-rw-r--r--Documentation/git-web--browse.txt4
-rw-r--r--Documentation/git.txt16
-rw-r--r--Documentation/gitcli.txt8
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitmodules.txt4
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/howto/keep-canonical-history-correct.txt216
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt2
-rw-r--r--Documentation/revisions.txt4
-rw-r--r--Documentation/technical/api-argv-array.txt8
-rw-r--r--Documentation/technical/api-builtin.txt13
-rw-r--r--Documentation/technical/api-run-command.txt7
-rw-r--r--Documentation/technical/api-strbuf.txt13
-rw-r--r--Documentation/technical/http-protocol.txt2
-rw-r--r--Documentation/user-manual.txt4
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile14
l---------RelNotes2
-rw-r--r--argv-array.c20
-rw-r--r--argv-array.h2
-rw-r--r--builtin/apply.c12
-rw-r--r--builtin/blame.c896
-rw-r--r--builtin/checkout.c10
-rw-r--r--builtin/clone.c9
-rw-r--r--builtin/commit.c144
-rw-r--r--builtin/config.c15
-rw-r--r--builtin/fast-export.c49
-rw-r--r--builtin/gc.c26
-rw-r--r--builtin/grep.c7
-rw-r--r--builtin/index-pack.c36
-rw-r--r--builtin/log.c8
-rw-r--r--builtin/ls-remote.c2
-rw-r--r--builtin/mailinfo.c6
-rw-r--r--builtin/merge.c8
-rw-r--r--builtin/mv.c3
-rw-r--r--builtin/notes.c6
-rw-r--r--builtin/patch-id.c74
-rw-r--r--builtin/reflog.c2
-rw-r--r--builtin/remote.c45
-rw-r--r--builtin/replace.c225
-rw-r--r--builtin/rerere.c2
-rw-r--r--builtin/reset.c6
-rw-r--r--builtin/tag.c98
-rw-r--r--builtin/update-index.c3
-rw-r--r--builtin/update-ref.c426
-rw-r--r--cache.h31
-rw-r--r--column.c43
-rw-r--r--combine-diff.c169
-rw-r--r--commit.c2
-rw-r--r--compat/bswap.h33
-rw-r--r--compat/mingw.c24
-rw-r--r--compat/mingw.h2
-rw-r--r--compat/mmap.c4
-rw-r--r--compat/poll/poll.c2
-rw-r--r--compat/win32/alloca.h (renamed from compat/vcbuild/include/alloca.h)0
-rw-r--r--config.c41
-rw-r--r--config.mak.uname18
-rw-r--r--configure.ac8
-rw-r--r--connect.c28
-rw-r--r--contrib/completion/git-completion.bash6
-rw-r--r--contrib/credential/wincred/Makefile16
-rw-r--r--contrib/diffall/README31
-rwxr-xr-xcontrib/diffall/git-diffall257
-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/subtree/Makefile38
-rwxr-xr-xcontrib/subtree/git-subtree.sh3
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh5
-rwxr-xr-xcontrib/svn-fe/svnrdump_sim.py93
-rwxr-xr-xcontrib/thunderbird-patch-inline/appp.sh14
-rw-r--r--contrib/vim/README22
-rw-r--r--daemon.c8
-rw-r--r--diff-lib.c33
-rw-r--r--diff.c63
-rw-r--r--diff.h11
-rw-r--r--dir.c34
-rw-r--r--environment.c3
-rw-r--r--fast-import.c13
-rw-r--r--git-compat-util.h21
-rwxr-xr-xgit-instaweb.sh12
-rwxr-xr-xgit-mergetool.sh14
-rwxr-xr-xgit-p4.py49
-rwxr-xr-xgit-pull.sh4
-rw-r--r--git-rebase--interactive.sh4
-rw-r--r--git-rebase--merge.sh4
-rwxr-xr-xgit-rebase.sh19
-rwxr-xr-xgit-remote-testgit.sh3
-rwxr-xr-xgit-send-email.perl16
-rw-r--r--git-sh-setup.sh2
-rwxr-xr-xgit-stash.sh5
-rwxr-xr-xgit-submodule.sh3
-rwxr-xr-xgit-web--browse.sh6
-rw-r--r--git.c2
-rw-r--r--grep.c5
-rw-r--r--http-push.c2
-rw-r--r--imap-send.c47
-rw-r--r--merge-recursive.c6
-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--notes.c6
-rw-r--r--pack-revindex.c2
-rw-r--r--pager.c4