summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/CodingGuidelines3
-rw-r--r--Documentation/Makefile133
-rw-r--r--Documentation/RelNotes-1.6.3.txt134
-rw-r--r--Documentation/SubmittingPatches10
-rw-r--r--Documentation/asciidoc.conf15
-rw-r--r--Documentation/blame-options.txt8
-rw-r--r--Documentation/callouts.xsl30
-rw-r--r--Documentation/config.txt83
-rw-r--r--Documentation/git-archive.txt4
-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.txt8
-rw-r--r--Documentation/git-cvsimport.txt36
-rw-r--r--Documentation/git-filter-branch.txt17
-rw-r--r--Documentation/git-format-patch.txt26
-rw-r--r--Documentation/git-grep.txt8
-rw-r--r--Documentation/git-imap-send.txt7
-rw-r--r--Documentation/git-merge.txt10
-rw-r--r--Documentation/git-patch-id.txt2
-rw-r--r--Documentation/git-push.txt26
-rw-r--r--Documentation/git-rebase.txt29
-rw-r--r--Documentation/git-remote.txt28
-rw-r--r--Documentation/git-rev-parse.txt8
-rw-r--r--Documentation/git-send-email.txt34
-rw-r--r--Documentation/git-svn.txt5
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/gitcli.txt24
-rw-r--r--Documentation/githooks.txt4
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/manpage-1.72.xsl27
-rw-r--r--Documentation/manpage-base.xsl35
-rw-r--r--Documentation/manpage-bold-literal.xsl17
-rw-r--r--Documentation/manpage-normal.xsl13
-rw-r--r--Documentation/manpage-suppress-sp.xsl21
-rw-r--r--Documentation/merge-strategies.txt14
-rw-r--r--Documentation/pretty-formats.txt9
-rw-r--r--Documentation/pretty-options.txt5
-rw-r--r--Documentation/technical/api-parse-options.txt28
-rw-r--r--Documentation/user-manual.txt6
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile63
l---------RelNotes2
-rw-r--r--archive.c5
-rw-r--r--attr.c73
-rw-r--r--attr.h6
-rw-r--r--branch.c60
-rw-r--r--branch.h7
-rw-r--r--builtin-add.c4
-rw-r--r--builtin-apply.c27
-rw-r--r--builtin-archive.c105
-rw-r--r--builtin-blame.c174
-rw-r--r--builtin-branch.c149
-rw-r--r--builtin-checkout.c8
-rw-r--r--builtin-clean.c4
-rw-r--r--builtin-clone.c101
-rw-r--r--builtin-config.c425
-rw-r--r--builtin-count-objects.c2
-rw-r--r--builtin-diff-tree.c1
-rw-r--r--builtin-fast-export.c16
-rw-r--r--builtin-fetch-pack.c13
-rw-r--r--builtin-fetch.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-gc.c3
-rw-r--r--builtin-grep.c70
-rw-r--r--builtin-init-db.c7
-rw-r--r--builtin-log.c95
-rw-r--r--builtin-ls-files.c264
-rw-r--r--builtin-ls-tree.c22
-rw-r--r--builtin-mailinfo.c1
-rw-r--r--builtin-merge.c2
-rw-r--r--builtin-pack-objects.c39
-rw-r--r--builtin-prune-packed.c2
-rw-r--r--builtin-push.c76
-rw-r--r--builtin-read-tree.c2
-rw-r--r--builtin-receive-pack.c2
-rw-r--r--builtin-remote.c570
-rw-r--r--builtin-rerere.c25
-rw-r--r--builtin-rev-list.c45
-rw-r--r--builtin-rm.c3
-rw-r--r--builtin-send-pack.c229
-rw-r--r--builtin-shortlog.c1
-rw-r--r--builtin-show-branch.c3
-rw-r--r--builtin-show-ref.c2
-rw-r--r--builtin-update-index.c2
-rw-r--r--builtin-upload-archive.c2
-rw-r--r--cache.h33
-rw-r--r--color.c8
-rw-r--r--color.h10
-rw-r--r--combine-diff.c7
-rw-r--r--compat/mingw.c144
-rw-r--r--compat/mingw.h13
-rw-r--r--compat/win32mmap.c53
-rw-r--r--compat/winansi.c18
-rw-r--r--config.c45
-rw-r--r--configure.ac386
-rw-r--r--connect.c11
-rwxr-xr-xcontrib/completion/git-completion.bash326
-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
-rwxr-xr-xcontrib/fast-import/import-tars.perl16
-rw-r--r--daemon.c2
-rw-r--r--diff-lib.c2
-rw-r--r--diff-no-index.c4
-rw-r--r--diff.c49
-rw-r--r--diff.h3
-rw-r--r--diffcore-break.c3
-rw-r--r--dir.c19
-rw-r--r--dir.h12
-rw-r--r--entry.c108
-rw-r--r--environment.c1
-rw-r--r--fast-import.c15
-rw-r--r--fsck.c6
-rwxr-xr-xgit-add--interactive.perl4
-rwxr-xr-xgit-bisect.sh2
-rw-r--r--git-compat-util.h26
-rwxr-xr-xgit-filter-branch.sh10
-rwxr-xr-xgit-instaweb.sh69
-rwxr-xr-xgit-pull.sh10
-rwxr-xr-xgit-rebase--interactive.sh26
-rwxr-xr-xgit-rebase.sh53
-rwxr-xr-xgit-repack.sh4
-rwxr-xr-xgit-send-email.perl141
-rwxr-xr-xgit-svn.perl14
-rw-r--r--grep.c148
-rw-r--r--grep.h5
-rw-r--r--http-push.c242
-rw-r--r--http.c199
-rw-r--r--imap