summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.mailmap1
-rw-r--r--Documentation/RelNotes-1.5.1.txt117
-rwxr-xr-xDocumentation/cmd-list.perl3
-rw-r--r--Documentation/config.txt22
-rw-r--r--Documentation/core-intro.txt3
-rw-r--r--Documentation/core-tutorial.txt8
-rw-r--r--Documentation/diff-options.txt3
-rw-r--r--Documentation/diffcore.txt7
-rw-r--r--Documentation/git-archimport.txt19
-rw-r--r--Documentation/git-branch.txt6
-rw-r--r--Documentation/git-bundle.txt139
-rw-r--r--Documentation/git-commit.txt9
-rw-r--r--Documentation/git-config.txt8
-rw-r--r--Documentation/git-cvsexportcommit.txt7
-rw-r--r--Documentation/git-diff-files.txt5
-rw-r--r--Documentation/git-diff-stages.txt42
-rw-r--r--Documentation/git-diff.txt4
-rw-r--r--Documentation/git-fast-import.txt13
-rw-r--r--Documentation/git-fetch-pack.txt5
-rw-r--r--Documentation/git-format-patch.txt16
-rw-r--r--Documentation/git-name-rev.txt6
-rw-r--r--Documentation/git-receive-pack.txt149
-rw-r--r--Documentation/git-remote.txt13
-rw-r--r--Documentation/git-resolve.txt38
-rw-r--r--Documentation/git-rev-list.txt5
-rw-r--r--Documentation/git-rev-parse.txt7
-rw-r--r--Documentation/git-send-email.txt10
-rw-r--r--Documentation/git-svn.txt467
-rw-r--r--Documentation/git-update-index.txt5
-rw-r--r--Documentation/git-upload-pack.txt9
-rw-r--r--Documentation/git.txt10
-rw-r--r--Documentation/howto/revert-branch-rebase.txt9
-rw-r--r--Documentation/pretty-formats.txt44
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile124
l---------RelNotes2
-rw-r--r--archive-tar.c4
-rw-r--r--archive-zip.c4
-rw-r--r--blob.c6
-rw-r--r--builtin-apply.c186
-rw-r--r--builtin-archive.c10
-rw-r--r--builtin-blame.c51
-rw-r--r--builtin-branch.c29
-rw-r--r--builtin-bundle.c449
-rw-r--r--builtin-cat-file.c19
-rw-r--r--builtin-checkout-index.c4
-rw-r--r--builtin-commit-tree.c15
-rw-r--r--builtin-config.c30
-rw-r--r--builtin-count-objects.c2
-rw-r--r--builtin-describe.c6
-rw-r--r--builtin-diff-files.c34
-rw-r--r--builtin-diff-index.c4
-rw-r--r--builtin-diff-stages.c107
-rw-r--r--builtin-diff.c49
-rw-r--r--builtin-fmt-merge-msg.c10
-rw-r--r--builtin-for-each-ref.c18
-rw-r--r--builtin-fsck.c32
-rw-r--r--builtin-grep.c25
-rw-r--r--builtin-init-db.c4
-rw-r--r--builtin-log.c30
-rw-r--r--builtin-ls-files.c8
-rw-r--r--builtin-ls-tree.c2
-rw-r--r--builtin-mailinfo.c8
-rw-r--r--builtin-merge-base.c (renamed from merge-base.c)12
-rw-r--r--builtin-name-rev.c50
-rw-r--r--builtin-pack-objects.c164
-rw-r--r--builtin-pack-refs.c2
-rw-r--r--builtin-prune.c11
-rw-r--r--builtin-push.c20
-rw-r--r--builtin-read-tree.c4
-rw-r--r--builtin-reflog.c12
-rw-r--r--builtin-rerere.c6
-rw-r--r--builtin-rev-parse.c12
-rw-r--r--builtin-revert.c404
-rw-r--r--builtin-shortlog.c10
-rw-r--r--builtin-show-branch.c27
-rw-r--r--builtin-show-ref.c12
-rw-r--r--builtin-tar-tree.c2
-rw-r--r--builtin-unpack-objects.c41
-rw-r--r--builtin-update-index.c17
-rw-r--r--builtin-write-tree.c2
-rw-r--r--builtin.h5
-rw-r--r--cache.h64
-rw-r--r--combine-diff.c20
-rw-r--r--commit.c231
-rw-r--r--commit.h3
-rw-r--r--config.c104
-rw-r--r--configure.ac31
-rw-r--r--connect.c6
-rwxr-xr-xcontrib/completion/git-completion.bash2
-rw-r--r--contrib/emacs/Makefile4
-rwxr-xr-xcontrib/examples/git-resolve.sh (renamed from git-resolve.sh)0
-rw-r--r--convert-objects.c14
-rw-r--r--convert.c186
-rw-r--r--daemon.c32
-rw-r--r--date.c20
-rw-r--r--diff-lib.c307
-rw-r--r--diff.c221
-rw-r--r--diff.h6
-rw-r--r--diffcore-break.c2
-rw-r--r--diffcore-order.c6
-rw-r--r--diffcore-rename.c7
-rw-r--r--dir.c4
-rw-r--r--entry.c31
-rw-r--r--environment.c4
-rw-r--r--exec_cmd.c2
-rw-r--r--fast-import.c169
-rw-r--r--fetch-pack.c24
-rwxr-xr-xgit-archimport.perl86
-rwxr-xr-xgit-clone.sh8
-rwxr-xr-xgit-commit.sh42
-rw-r--r--git-compat-util.h16
-rwxr-xr-xgit-cvsexportcommit.perl27
-rwxr-xr-xgit-cvsserver.perl108
-rwxr-xr-xgit-fetch.sh21
-rwxr-xr-xgit-ls-remote.sh7
-rwxr-xr-xgit-remote.perl35
-rwxr-xr-xgit-revert.sh197
-rwxr-xr-xgit-send-email.perl107
-rwxr-xr-xgit-svn.perl5058
-rw-r--r--git.c21
-rwxr-xr-xgitweb/gitweb.perl10
-rw-r--r--hash-object.c6
-rw-r--r--help.c4
-rw-r--r--http-fetch.c4
-rw-r--r--http-push.c16
-rw-r--r--imap-send.c8
-rw-r--r--index-pack.c24
-rw-r--r--interpolate.c2
-rw-r--r--interpolate.h2
-rw-r--r--log-tree.c12