summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--Documentation/Makefile12
-rw-r--r--Documentation/RelNotes/1.7.11.txt176
-rw-r--r--Documentation/config.txt124
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt2
-rw-r--r--Documentation/everyday.txt4
-rw-r--r--Documentation/git-am.txt3
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt14
-rw-r--r--Documentation/git-bundle.txt8
-rw-r--r--Documentation/git-check-ref-format.txt12
-rw-r--r--Documentation/git-checkout.txt8
-rw-r--r--Documentation/git-cherry-pick.txt23
-rw-r--r--Documentation/git-column.txt53
-rw-r--r--Documentation/git-commit.txt4
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-fast-import.txt48
-rw-r--r--Documentation/git-filter-branch.txt34
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-gc.txt2
-rw-r--r--Documentation/git-grep.txt4
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-p4.txt73
-rw-r--r--Documentation/git-pack-refs.txt2
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt28
-rw-r--r--Documentation/git-rebase.txt14
-rw-r--r--Documentation/git-reflog.txt6
-rw-r--r--Documentation/git-remote-helpers.txt8
-rw-r--r--Documentation/git-remote.txt6
-rw-r--r--Documentation/git-rerere.txt6
-rw-r--r--Documentation/git-reset.txt2
-rw-r--r--Documentation/git-rev-parse.txt7
-rw-r--r--Documentation/git-revert.txt4
-rw-r--r--Documentation/git-rm.txt3
-rw-r--r--Documentation/git-shortlog.txt2
-rw-r--r--Documentation/git-show-ref.txt2
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/git-stash.txt18
-rw-r--r--Documentation/git-status.txt11
-rw-r--r--Documentation/git-tag.txt9
-rw-r--r--Documentation/git-tar-tree.txt2
-rw-r--r--Documentation/git-update-index.txt6
-rw-r--r--Documentation/git-var.txt12
-rw-r--r--Documentation/git-whatchanged.txt2
-rw-r--r--Documentation/gitcli.txt12
-rw-r--r--Documentation/gitcore-tutorial.txt32
-rw-r--r--Documentation/gitcredentials.txt4
-rw-r--r--Documentation/gitdiffcore.txt10
-rw-r--r--Documentation/githooks.txt8
-rw-r--r--Documentation/gitweb.conf.txt19
-rw-r--r--Documentation/gitworkflows.txt4
-rw-r--r--Documentation/pretty-formats.txt6
-rw-r--r--Documentation/pull-fetch-param.txt2
-rw-r--r--Documentation/rev-list-options.txt6
-rw-r--r--Documentation/technical/api-argv-array.txt5
-rw-r--r--Documentation/technical/api-parse-options.txt36
-rw-r--r--Documentation/technical/api-revision-walking.txt5
-rw-r--r--Documentation/technical/index-format.txt13
-rw-r--r--Documentation/technical/protocol-common.txt2
-rw-r--r--Documentation/user-manual.txt8
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL3
-rw-r--r--Makefile80
l---------RelNotes2
-rw-r--r--advice.c6
-rw-r--r--advice.h3
-rw-r--r--argv-array.c14
-rw-r--r--argv-array.h3
-rw-r--r--branch.c9
-rw-r--r--branch.h2
-rw-r--r--builtin.h1
-rw-r--r--builtin/apply.c380
-rw-r--r--builtin/branch.c70
-rw-r--r--builtin/cat-file.c25
-rw-r--r--builtin/checkout.c1
-rw-r--r--builtin/column.c59
-rw-r--r--builtin/commit.c72
-rw-r--r--builtin/fetch.c4
-rw-r--r--builtin/fmt-merge-msg.c114
-rw-r--r--builtin/fsck.c8
-rw-r--r--builtin/gc.c89
-rw-r--r--builtin/help.c53
-rw-r--r--builtin/index-pack.c125
-rw-r--r--builtin/log.c34
-rw-r--r--builtin/merge-file.c4
-rw-r--r--builtin/pack-objects.c25
-rw-r--r--builtin/push.c117
-rw-r--r--builtin/remote.c231
-rw-r--r--builtin/rev-parse.c2
-rw-r--r--builtin/revert.c9
-rw-r--r--builtin/send-pack.c13
-rw-r--r--builtin/tag.c27
-rw-r--r--builtin/unpack-objects.c2
-rw-r--r--builtin/update-index.c14
-rw-r--r--builtin/update-server-info.c1
-rw-r--r--bundle.c38
-rw-r--r--cache.h62
-rw-r--r--column.c434
-rw-r--r--column.h45
-rw-r--r--command-list.txt2
-rw-r--r--commit.c56
-rw-r--r--commit.h2
-rw-r--r--compat/mingw.h7
-rw-r--r--compat/win32mmap.c2
-rw-r--r--config.c36
-rw-r--r--configure.ac197
-rwxr-xr-xcontrib/completion/git-completion.bash22
-rw-r--r--contrib/examples/builtin-fetch--tool.c4
-rw-r--r--contrib/fast-import/git-p4.README12
-rw-r--r--contrib/fast-import/git-p4.bat1
-rwxr-xr-xcontrib/rerere-train.sh2
-rw-r--r--contrib/subtree/.gitignore5
-rw-r--r--contrib/subtree/COPYING339
-rw-r--r--contrib/subtree/INSTALL28
-rw-r--r--contrib/subtree/Makefile52
-rw-r--r--contrib/subtree/README8
-rwxr-xr-xcontrib/subtree/git-subtree.sh712
-rw-r--r--contrib/subtree/git-subtree.txt366
-rw-r--r--contrib/subtree/t/Makefile69
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh508
-rw-r--r--contrib/subtree/todo50
-rw-r--r--date.c95
-rw-r--r--diff.c60
-rw-r--r--diff.h3
-rw-r--r--entry.c53
-rw-r--r--environment.c2