summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/CodingGuidelines3
-rw-r--r--Documentation/RelNotes-1.5.2.2.txt2
-rw-r--r--Documentation/RelNotes-1.6.0.2.txt2
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt4
-rw-r--r--Documentation/RelNotes-1.6.1.2.txt4
-rw-r--r--Documentation/RelNotes-1.6.2.1.txt19
-rw-r--r--Documentation/RelNotes-1.6.2.txt6
-rw-r--r--Documentation/RelNotes-1.6.3.txt104
-rw-r--r--Documentation/SubmittingPatches10
-rw-r--r--Documentation/blame-options.txt14
-rw-r--r--Documentation/config.txt43
-rw-r--r--Documentation/git-add.txt19
-rw-r--r--Documentation/git-am.txt36
-rw-r--r--Documentation/git-annotate.txt6
-rw-r--r--Documentation/git-apply.txt28
-rw-r--r--Documentation/git-archive.txt21
-rw-r--r--Documentation/git-bisect.txt18
-rw-r--r--Documentation/git-branch.txt4
-rw-r--r--Documentation/git-checkout.txt37
-rw-r--r--Documentation/git-config.txt10
-rw-r--r--Documentation/git-filter-branch.txt17
-rw-r--r--Documentation/git-format-patch.txt21
-rw-r--r--Documentation/git-imap-send.txt7
-rw-r--r--Documentation/git-merge.txt6
-rw-r--r--Documentation/git-push.txt26
-rw-r--r--Documentation/git-rebase.txt19
-rw-r--r--Documentation/git-rev-parse.txt8
-rw-r--r--Documentation/git-send-email.txt61
-rw-r--r--Documentation/git.txt6
-rw-r--r--Documentation/gitcli.txt24
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt4
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt2
-rw-r--r--Documentation/pretty-formats.txt9
-rw-r--r--Documentation/pretty-options.txt5
-rw-r--r--Documentation/rev-list-options.txt4
-rw-r--r--Documentation/technical/api-parse-options.txt28
-rw-r--r--Documentation/technical/api-strbuf.txt2
-rw-r--r--Documentation/user-manual.txt6
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile42
l---------RelNotes2
-rw-r--r--archive.c5
-rw-r--r--builtin-add.c2
-rw-r--r--builtin-apply.c2
-rw-r--r--builtin-archive.c103
-rw-r--r--builtin-blame.c174
-rw-r--r--builtin-branch.c149
-rw-r--r--builtin-checkout.c2
-rw-r--r--builtin-clone.c13
-rw-r--r--builtin-config.c16
-rw-r--r--builtin-count-objects.c2
-rw-r--r--builtin-diff-tree.c1
-rw-r--r--builtin-fetch-pack.c9
-rw-r--r--builtin-fmt-merge-msg.c6
-rw-r--r--builtin-for-each-ref.c1
-rw-r--r--builtin-fsck.c2
-rw-r--r--builtin-log.c83
-rw-r--r--builtin-ls-files.c1
-rw-r--r--builtin-mailinfo.c1
-rw-r--r--builtin-pack-objects.c14
-rw-r--r--builtin-prune-packed.c2
-rw-r--r--builtin-receive-pack.c2
-rw-r--r--builtin-remote.c3
-rw-r--r--builtin-rerere.c25
-rw-r--r--builtin-rev-list.c45
-rw-r--r--builtin-revert.c1
-rw-r--r--builtin-shortlog.c1
-rw-r--r--builtin-update-index.c2
-rw-r--r--builtin-upload-archive.c2
-rw-r--r--cache.h23
-rw-r--r--color.c8
-rw-r--r--color.h10
-rw-r--r--combine-diff.c7
-rw-r--r--compat/memmem.c5
-rw-r--r--compat/mingw.c142
-rw-r--r--compat/mingw.h8
-rw-r--r--connect.c11
-rwxr-xr-xcontrib/completion/git-completion.bash292
-rwxr-xr-xcontrib/difftool/git-difftool6
-rwxr-xr-xcontrib/difftool/git-difftool-helper19
-rw-r--r--contrib/difftool/git-difftool.txt30
-rwxr-xr-xcontrib/fast-import/git-p42
-rw-r--r--daemon.c2
-rw-r--r--date.c20
-rw-r--r--diff-lib.c2
-rw-r--r--diff-no-index.c4
-rw-r--r--diff.c39
-rw-r--r--diff.h3
-rw-r--r--diffcore-break.c3
-rw-r--r--diffcore-pickaxe.c24
-rw-r--r--dir.c4
-rw-r--r--entry.c108
-rw-r--r--fast-import.c8
-rw-r--r--fsck.c6
-rwxr-xr-xgit-add--interactive.perl59
-rwxr-xr-xgit-am.sh20
-rwxr-xr-xgit-bisect.sh86
-rw-r--r--git-compat-util.h16
-rwxr-xr-xgit-filter-branch.sh4
-rwxr-xr-xgit-instaweb.sh69
-rwxr-xr-xgit-pull.sh10
-rwxr-xr-xgit-rebase.sh49
-rwxr-xr-xgit-repack.sh6
-rwxr-xr-xgit-send-email.perl284
-rwxr-xr-xgit-submodule.sh15
-rwxr-xr-xgit-svn.perl9
-rw-r--r--gitk-git/gitk10
-rw-r--r--hash-object.c4
-rw-r--r--http-push.c2
-rw-r--r--http.c30
-rw-r--r--imap-send.c55
-rw-r--r--index-pack.c2
-rw-r--r--lockfile.c4
-rw-r--r--log-tree.c17
-rw-r--r--merge-recursive.c11
-rw-r--r--parse-options.c28
-rw-r--r--parse-options.h2
-rw-r--r--pretty.c35
-rw-r--r--read-cache.c85
-rw-r--r--remote.c2
-rw-r--r--rerere.c22
-rw-r--r--rerere.h2
-rw-r--r--revision.c31
-rw-r--r--revision.h8
-rw-r--r--sha1_file.c60
-rw-r--r--symlinks.c153
-rw-r--r--t/Makefile5
-rw-r--r--t/README18
-rw-r--r--t/lib-httpd/apache.conf3
-rwxr-xr-xt/t0000-basic.sh8
-rwxr-xr-xt/t1100-commit-tree-options.sh<