summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--.mailmap19
-rw-r--r--Documentation/CodingGuidelines8
-rw-r--r--Documentation/Makefile23
-rw-r--r--Documentation/RelNotes/1.8.0.3.txt14
-rw-r--r--Documentation/RelNotes/1.8.1.1.txt87
-rw-r--r--Documentation/RelNotes/1.8.1.2.txt25
-rw-r--r--Documentation/RelNotes/1.8.1.3.txt47
-rw-r--r--Documentation/RelNotes/1.8.1.4.txt11
-rw-r--r--Documentation/RelNotes/1.8.1.5.txt47
-rw-r--r--Documentation/RelNotes/1.8.1.6.txt34
-rw-r--r--Documentation/RelNotes/1.8.1.txt36
-rw-r--r--Documentation/SubmittingPatches170
-rw-r--r--Documentation/config.txt13
-rw-r--r--Documentation/diff-options.txt10
-rw-r--r--Documentation/fetch-options.txt13
-rw-r--r--Documentation/git-add.txt10
-rw-r--r--Documentation/git-bisect.txt7
-rw-r--r--Documentation/git-bundle.txt9
-rw-r--r--Documentation/git-checkout.txt51
-rw-r--r--Documentation/git-commit-tree.txt4
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt4
-rw-r--r--Documentation/git-cvsimport.txt12
-rw-r--r--Documentation/git-describe.txt5
-rw-r--r--Documentation/git-diff.txt9
-rw-r--r--Documentation/git-fast-import.txt103
-rw-r--r--Documentation/git-filter-branch.txt27
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-merge.txt24
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-remote-helpers.txto9
-rw-r--r--Documentation/git-remote-testgit.txt2
-rw-r--r--Documentation/git-shortlog.txt3
-rw-r--r--Documentation/git-submodule.txt2
-rw-r--r--Documentation/git-svn.txt91
-rw-r--r--Documentation/git-tag.txt8
-rw-r--r--Documentation/git-update-index.txt10
-rw-r--r--Documentation/git.txt61
-rw-r--r--Documentation/githooks.txt10
-rw-r--r--Documentation/gitremote-helpers.txt (renamed from Documentation/git-remote-helpers.txt)251
-rw-r--r--Documentation/howto/maintain-git.txt347
-rw-r--r--Documentation/howto/new-command.txt (renamed from Documentation/technical/api-command.txt)23
-rw-r--r--Documentation/mailmap.txt2
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/pt_BR/gittutorial.txt675
-rw-r--r--Documentation/revisions.txt8
-rw-r--r--Documentation/technical/api-allocation-growing.txt14
-rw-r--r--Documentation/technical/api-history-graph.txt10
-rw-r--r--Documentation/technical/api-index-skel.txt2
-rw-r--r--Documentation/technical/api-run-command.txt6
-rw-r--r--Documentation/technical/api-string-list.txt8
-rw-r--r--Documentation/technical/index-format.txt11
-rw-r--r--Documentation/urls.txt2
-rw-r--r--Documentation/user-manual.txt263
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL5
-rw-r--r--Makefile80
-rw-r--r--README22
l---------RelNotes2
-rw-r--r--abspath.c105
-rw-r--r--archive-tar.c2
-rw-r--r--archive-zip.c7
-rw-r--r--attr.c10
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/apply.c63
-rw-r--r--builtin/branch.c8
-rw-r--r--builtin/clean.c154
-rw-r--r--builtin/clone.c6
-rw-r--r--builtin/commit.c4
-rw-r--r--builtin/fmt-merge-msg.c21
-rw-r--r--builtin/grep.c4
-rw-r--r--builtin/help.c18
-rw-r--r--builtin/index-pack.c9
-rw-r--r--builtin/merge-index.c4
-rw-r--r--builtin/merge-tree.c92
-rw-r--r--builtin/merge.c6
-rw-r--r--builtin/pack-redundant.c6
-rw-r--r--builtin/prune.c4
-rw-r--r--builtin/shortlog.c5
-rw-r--r--builtin/update-index.c2
-rw-r--r--bundle.c16
-rw-r--r--cache-tree.c61
-rw-r--r--cache-tree.h1
-rw-r--r--cache.h20
-rw-r--r--combine-diff.c21
-rw-r--r--compat/fnmatch/fnmatch.c24
-rw-r--r--compat/nedmalloc/nedmalloc.c5
-rw-r--r--config.c10
-rw-r--r--configure.ac12
-rw-r--r--contrib/completion/git-completion.bash22
-rw-r--r--contrib/completion/git-completion.tcsh33
-rw-r--r--contrib/completion/git-prompt.sh32
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg2
-rwxr-xr-xcontrib/remote-helpers/test-hg-bidi.sh2
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh2
-rwxr-xr-xcontrib/stats/mailmap.pl96
-rw-r--r--contrib/subtree/.gitignore1
-rw-r--r--contrib/subtree/git-subtree.txt2
-rw-r--r--contrib/vim/README16
-rw-r--r--daemon.c4
-rw-r--r--diff.c14
-rw-r--r--dir.c97
-rw-r--r--editor.c20
-rw-r--r--entry.c2
-rwxr-xr-xgit-am.sh4
-rw-r--r--git-compat-util.h17
-rwxr-xr-xgit-cvsimport.perl5
-rwxr-xr-xgit-difftool--helper.sh2
-rwxr-xr-xgit-mergetool.sh2
-rwxr-xr-xgit-p4.py30
-rw-r--r--git-rebase--interactive.sh7
-rwxr-xr-xgit-send-email.perl10
-rw-r--r--git-sh-setup.sh7
-rw-r--r--git.c6
-rw-r--r--gitweb/README3
-rwxr-xr-xgitweb/gitweb.perl41
-rw-r--r--gpg-interface.c4
-rw-r--r--graph.c2
-rw-r--r--help.c17
-rw-r--r--http-push.c4
-rw-r--r--http.c33
-rw-r--r--http.h2
-rw-r--r--ident.c6
-rw-r--r--imap-send.c78
-rw-r--r--merge-blobs.c (renamed from merge-file.c)4
-rw-r--r--merge-blobs.h8
-rw-r--r--merge-file.h7
-rw-r--r--merge-recursive.c6
-rw-r--r--mergetools/p4merge27