summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/RelNotes/1.9.txt326
-rw-r--r--Documentation/config.txt12
-rw-r--r--Documentation/diff-config.txt5
-rw-r--r--Documentation/diff-options.txt3
-rw-r--r--Documentation/fetch-options.txt40
-rw-r--r--Documentation/git-cat-file.txt12
-rw-r--r--Documentation/git-clone.txt7
-rw-r--r--Documentation/git-fetch.txt17
-rw-r--r--Documentation/git-filter-branch.txt33
-rw-r--r--Documentation/git-for-each-ref.txt18
-rw-r--r--Documentation/git-lost-found.txt74
-rw-r--r--Documentation/git-merge-base.txt38
-rw-r--r--Documentation/git-mv.txt12
-rw-r--r--Documentation/git-pack-objects.txt3
-rw-r--r--Documentation/git-peek-remote.txt43
-rw-r--r--Documentation/git-prune.txt2
-rw-r--r--Documentation/git-pull.txt4
-rw-r--r--Documentation/git-push.txt9
-rw-r--r--Documentation/git-rebase.txt10
-rw-r--r--Documentation/git-replace.txt19
-rw-r--r--Documentation/git-repo-config.txt23
-rw-r--r--Documentation/git-rev-parse.txt22
-rw-r--r--Documentation/git-rm.txt9
-rw-r--r--Documentation/git-show-ref.txt1
-rw-r--r--Documentation/git-tar-tree.txt82
-rw-r--r--Documentation/git.txt9
-rw-r--r--Documentation/gitattributes.txt9
-rw-r--r--Documentation/gitcli.txt6
-rw-r--r--Documentation/gitignore.txt21
-rw-r--r--Documentation/gitremote-helpers.txt7
-rw-r--r--Documentation/gitweb.conf.txt37
-rw-r--r--Documentation/glossary-content.txt34
-rw-r--r--Documentation/merge-options.txt9
-rw-r--r--Documentation/merge-strategies.txt8
-rw-r--r--Documentation/rev-list-options.txt15
-rw-r--r--Documentation/technical/api-builtin.txt4
-rw-r--r--Documentation/technical/api-parse-options.txt6
-rw-r--r--Documentation/technical/api-remote.txt20
-rw-r--r--Documentation/technical/pack-protocol.txt7
-rw-r--r--Documentation/technical/protocol-capabilities.txt31
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile24
l---------RelNotes2
-rw-r--r--abspath.c18
-rw-r--r--alias.c2
-rw-r--r--attr.c2
-rw-r--r--bisect.c4
-rw-r--r--branch.c4
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c7
-rw-r--r--builtin/apply.c12
-rw-r--r--builtin/archive.c4
-rw-r--r--builtin/blame.c11
-rw-r--r--builtin/branch.c8
-rw-r--r--builtin/cat-file.c8
-rw-r--r--builtin/checkout.c20
-rw-r--r--builtin/clean.c4
-rw-r--r--builtin/clone.c30
-rw-r--r--builtin/column.c2
-rw-r--r--builtin/commit.c23
-rw-r--r--builtin/config.c6
-rw-r--r--builtin/describe.c2
-rw-r--r--builtin/diff.c58
-rw-r--r--builtin/fast-export.c6
-rw-r--r--builtin/fetch-pack.c43
-rw-r--r--builtin/fetch.c371
-rw-r--r--builtin/fmt-merge-msg.c10
-rw-r--r--builtin/for-each-ref.c108
-rw-r--r--builtin/fsck.c6
-rw-r--r--builtin/gc.c1
-rw-r--r--builtin/get-tar-commit-id.c40
-rw-r--r--builtin/help.c14
-rw-r--r--builtin/index-pack.c8
-rw-r--r--builtin/init-db.c2
-rw-r--r--builtin/log.c8
-rw-r--r--builtin/ls-remote.c4
-rw-r--r--builtin/mailinfo.c16
-rw-r--r--builtin/merge-base.c175
-rw-r--r--builtin/merge-recursive.c4
-rw-r--r--builtin/merge.c14
-rw-r--r--builtin/name-rev.c9
-rw-r--r--builtin/notes.c2
-rw-r--r--builtin/pack-objects.c4
-rw-r--r--builtin/prune-packed.c38
-rw-r--r--builtin/prune.c46
-rw-r--r--builtin/push.c91
-rw-r--r--builtin/receive-pack.c319
-rw-r--r--builtin/reflog.c4
-rw-r--r--builtin/remote.c227
-rw-r--r--builtin/repack.c2
-rw-r--r--builtin/replace.c67
-rw-r--r--builtin/rev-parse.c51
-rw-r--r--builtin/send-pack.c17
-rw-r--r--builtin/shortlog.c6
-rw-r--r--builtin/show-branch.c23
-rw-r--r--builtin/show-ref.c6
-rw-r--r--builtin/symbolic-ref.c2
-rw-r--r--builtin/tag.c2
-rw-r--r--builtin/tar-tree.c102
-rw-r--r--builtin/unpack-objects.c2
-rw-r--r--builtin/update-ref.c10
-rw-r--r--builtin/upload-archive.c2
-rw-r--r--bundle.c32
-rw-r--r--cache.h25
-rw-r--r--command-list.txt4
-rw-r--r--commit-slab.h39
-rw-r--r--commit.c65
-rw-r--r--commit.h42
-rw-r--r--compat/mingw.c17
-rw-r--r--compat/mingw.h3
-rwxr-xr-x[-rw-r--r--]compat/vcbuild/scripts/clink.pl0
-rwxr-xr-x[-rw-r--r--]compat/vcbuild/scripts/lib.pl0
-rw-r--r--config.c35
-rw-r--r--config.mak.uname7
-rw-r--r--connect.c273
-rw-r--r--connect.h2
-rw-r--r--connected.c44
-rw-r--r--connected.h2
-rwxr-xr-x[-rw-r--r--]contrib/buildsystems/engine.pl0
-rwxr-xr-x[-rw-r--r--]contrib/buildsystems/generate0
-rwxr-xr-x[-rw-r--r--]contrib/buildsystems/parse.pl0
-rw-r--r--contrib/completion/git-completion.bash39
-rw-r--r--contrib/completion/git-completion.tcsh2
-rw-r--r--contrib/completion/git-completion.zsh10
-rw-r--r--contrib/credential/gnome-keyring/git-credential-gnome-keyring.c85
-rwxr-xr-xcontrib/examples/git-whatchanged.sh4
-rwxr-xr-xcontrib/hooks/post-receive-email1
-rwxr-xr-x[-rw-r--r--]contrib/hooks/pre-auto-gc-battery1