summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.mailmap2
-rw-r--r--Documentation/CodingGuidelines52
-rw-r--r--Documentation/Makefile23
-rw-r--r--Documentation/RelNotes/1.6.4.5.txt20
-rw-r--r--Documentation/RelNotes/1.6.5.9.txt18
-rw-r--r--Documentation/RelNotes/1.6.6.3.txt23
-rw-r--r--Documentation/RelNotes/1.7.0.9.txt8
-rw-r--r--Documentation/RelNotes/1.7.1.4.txt8
-rw-r--r--Documentation/RelNotes/1.7.2.5.txt8
-rw-r--r--Documentation/RelNotes/1.7.3.4.txt13
-rw-r--r--Documentation/RelNotes/1.7.4.txt148
-rw-r--r--Documentation/config.txt61
-rw-r--r--Documentation/diff-options.txt9
-rw-r--r--Documentation/everyday.txt6
-rw-r--r--Documentation/fetch-options.txt13
-rw-r--r--Documentation/git-archimport.txt2
-rw-r--r--Documentation/git-blame.txt6
-rw-r--r--Documentation/git-branch.txt14
-rw-r--r--Documentation/git-checkout.txt2
-rw-r--r--Documentation/git-clone.txt6
-rw-r--r--Documentation/git-commit.txt21
-rw-r--r--Documentation/git-cvsexportcommit.txt4
-rw-r--r--Documentation/git-cvsserver.txt4
-rw-r--r--Documentation/git-daemon.txt4
-rw-r--r--Documentation/git-describe.txt2
-rw-r--r--Documentation/git-diff.txt11
-rw-r--r--Documentation/git-difftool.txt11
-rw-r--r--Documentation/git-fast-import.txt92
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-fmt-merge-msg.txt16
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-fsck.txt3
-rw-r--r--Documentation/git-gc.txt8
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/git-merge.txt27
-rw-r--r--Documentation/git-notes.txt85
-rw-r--r--Documentation/git-pull.txt13
-rw-r--r--Documentation/git-read-tree.txt13
-rw-r--r--Documentation/git-rebase.txt4
-rw-r--r--Documentation/git-remote-ext.txt125
-rw-r--r--Documentation/git-remote-fd.txt59
-rw-r--r--Documentation/git-remote.txt6
-rw-r--r--Documentation/git-send-email.txt42
-rw-r--r--Documentation/git-shell.txt28
-rw-r--r--Documentation/git-tag.txt4
-rw-r--r--Documentation/git-verify-tag.txt4
-rw-r--r--Documentation/git-web--browse.txt6
-rw-r--r--Documentation/git.txt25
-rw-r--r--Documentation/gitattributes.txt19
-rw-r--r--Documentation/gitdiffcore.txt6
-rw-r--r--Documentation/gitmodules.txt8
-rw-r--r--Documentation/gittutorial-2.txt2
-rw-r--r--Documentation/gittutorial.txt6
-rw-r--r--Documentation/glossary-content.txt20
-rw-r--r--Documentation/merge-config.txt6
-rw-r--r--Documentation/merge-options.txt6
-rw-r--r--Documentation/merge-strategies.txt26
-rw-r--r--Documentation/rev-list-options.txt2
-rw-r--r--Documentation/revisions.txt10
-rw-r--r--Documentation/technical/api-merge.txt71
-rw-r--r--Documentation/technical/api-parse-options.txt9
-rw-r--r--Documentation/user-manual.txt39
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL5
-rw-r--r--Makefile121
l---------RelNotes2
-rw-r--r--abspath.c6
-rw-r--r--archive.c2
-rw-r--r--attr.c52
-rw-r--r--branch.h4
-rw-r--r--builtin.h11
-rw-r--r--builtin/add.c9
-rw-r--r--builtin/apply.c2
-rw-r--r--builtin/blame.c32
-rw-r--r--builtin/branch.c15
-rw-r--r--builtin/checkout-index.c9
-rw-r--r--builtin/checkout.c10
-rw-r--r--builtin/clean.c6
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/commit-tree.c12
-rw-r--r--builtin/commit.c149
-rw-r--r--builtin/count-objects.c2
-rw-r--r--builtin/describe.c91
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/fetch-pack.c4
-rw-r--r--builtin/fetch.c73
-rw-r--r--builtin/fmt-merge-msg.c66
-rw-r--r--builtin/fsck.c2
-rw-r--r--builtin/gc.c5
-rw-r--r--builtin/grep.c8
-rw-r--r--builtin/log.c14
-rw-r--r--builtin/ls-files.c3
-rw-r--r--builtin/mailinfo.c2
-rw-r--r--builtin/merge-file.c2
-rw-r--r--builtin/merge-recursive.c15
-rw-r--r--builtin/merge.c102
-rw-r--r--builtin/mv.c4
-rw-r--r--builtin/notes.c277
-rw-r--r--builtin/pack-objects.c6
-rw-r--r--builtin/prune.c5
-rw-r--r--builtin/read-tree.c12
-rw-r--r--builtin/remote-ext.c246
-rw-r--r--builtin/remote-fd.c79
-rw-r--r--builtin/remote.c10
-rw-r--r--builtin/reset.c2
-rw-r--r--builtin/rm.c18
-rw-r--r--builtin/send-pack.c3
-rw-r--r--builtin/shortlog.c4
-rw-r--r--builtin/show-branch.c6
-rw-r--r--builtin/show-ref.c3
-rw-r--r--builtin/symbolic-ref.c3
-rw-r--r--builtin/tag.c2
-rw-r--r--builtin/update-index.c395
-rw-r--r--builtin/update-server-info.c3
-rw-r--r--builtin/verify-tag.c2
-rw-r--r--cache.h52
-rw-r--r--color.c5
-rw-r--r--color.h5
-rw-r--r--commit.c50
-rw-r--r--commit.h14
-rw-r--r--compat/inet_ntop.c22
-rw-r--r--compat/inet_pton.c8
-rw-r--r--compat/mingw.c333
-rw-r--r--compat/mingw.h101
-rw-r--r--compat/msvc.c29
-rw-r--r--compat/vcbuild/include/dirent.h128
-rw-r--r--compat/vcbuild/include/unistd.h4
-rw-r--r--compat/win32/dirent.c108
-rw-r--r--compat/win32/dirent.h24
-rw-r--r--compat/win32/sys/poll.c599