summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.mailmap2
-rw-r--r--Documentation/CodingGuidelines81
-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.8.txt10
-rw-r--r--Documentation/RelNotes/1.7.0.9.txt8
-rw-r--r--Documentation/RelNotes/1.7.1.3.txt10
-rw-r--r--Documentation/RelNotes/1.7.1.4.txt8
-rw-r--r--Documentation/RelNotes/1.7.2.4.txt10
-rw-r--r--Documentation/RelNotes/1.7.2.5.txt8
-rw-r--r--Documentation/RelNotes/1.7.3.1.txt14
-rw-r--r--Documentation/RelNotes/1.7.3.2.txt5
-rw-r--r--Documentation/RelNotes/1.7.3.3.txt54
-rw-r--r--Documentation/RelNotes/1.7.3.4.txt45
-rw-r--r--Documentation/RelNotes/1.7.4.txt118
-rw-r--r--Documentation/SubmittingPatches21
-rw-r--r--Documentation/config.txt68
-rw-r--r--Documentation/diff-generate-patch.txt40
-rw-r--r--Documentation/diff-options.txt45
-rw-r--r--Documentation/everyday.txt6
-rw-r--r--Documentation/fetch-options.txt4
-rw-r--r--Documentation/git-add.txt80
-rw-r--r--Documentation/git-am.txt4
-rw-r--r--Documentation/git-apply.txt6
-rw-r--r--Documentation/git-archimport.txt2
-rw-r--r--Documentation/git-archive.txt4
-rw-r--r--Documentation/git-blame.txt6
-rw-r--r--Documentation/git-branch.txt14
-rw-r--r--Documentation/git-bundle.txt6
-rw-r--r--Documentation/git-cat-file.txt2
-rw-r--r--Documentation/git-check-ref-format.txt2
-rw-r--r--Documentation/git-checkout-index.txt2
-rw-r--r--Documentation/git-checkout.txt18
-rw-r--r--Documentation/git-cherry-pick.txt4
-rw-r--r--Documentation/git-clone.txt11
-rw-r--r--Documentation/git-commit-tree.txt2
-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.txt52
-rw-r--r--Documentation/git-describe.txt2
-rw-r--r--Documentation/git-diff.txt34
-rw-r--r--Documentation/git-difftool.txt5
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-fast-import.txt12
-rw-r--r--Documentation/git-fetch.txt4
-rw-r--r--Documentation/git-filter-branch.txt4
-rw-r--r--Documentation/git-fmt-merge-msg.txt16
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-gc.txt6
-rw-r--r--Documentation/git-index-pack.txt4
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-ls-tree.txt10
-rw-r--r--Documentation/git-mailsplit.txt2
-rw-r--r--Documentation/git-merge.txt41
-rw-r--r--Documentation/git-mergetool.txt2
-rw-r--r--Documentation/git-notes.txt85
-rw-r--r--Documentation/git-pack-objects.txt16
-rw-r--r--Documentation/git-pull.txt27
-rw-r--r--Documentation/git-push.txt2
-rw-r--r--Documentation/git-read-tree.txt6
-rw-r--r--Documentation/git-rebase.txt4
-rw-r--r--Documentation/git-reflog.txt2
-rw-r--r--Documentation/git-relink.txt2
-rw-r--r--Documentation/git-remote-ext.txt125
-rw-r--r--Documentation/git-remote-fd.txt59
-rw-r--r--Documentation/git-remote.txt8
-rw-r--r--Documentation/git-repack.txt16
-rw-r--r--Documentation/git-reset.txt76
-rw-r--r--Documentation/git-rev-list.txt18
-rw-r--r--Documentation/git-rev-parse.txt2
-rw-r--r--Documentation/git-revert.txt4
-rw-r--r--Documentation/git-rm.txt12
-rw-r--r--Documentation/git-send-email.txt45
-rw-r--r--Documentation/git-shell.txt28
-rw-r--r--Documentation/git-shortlog.txt2
-rw-r--r--Documentation/git-show-branch.txt4
-rw-r--r--Documentation/git-show-ref.txt6
-rw-r--r--Documentation/git-show.txt6
-rw-r--r--Documentation/git-svn.txt19
-rw-r--r--Documentation/git-tag.txt4
-rw-r--r--Documentation/git-update-index.txt8
-rw-r--r--Documentation/git-verify-tag.txt4
-rw-r--r--Documentation/git-web--browse.txt22
-rw-r--r--Documentation/git.txt29
-rw-r--r--Documentation/gitattributes.txt21
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitdiffcore.txt6
-rw-r--r--Documentation/gitignore.txt30
-rw-r--r--Documentation/gitk.txt2
-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.txt28
-rw-r--r--Documentation/pretty-options.txt4
-rw-r--r--Documentation/rev-list-options.txt33
-rw-r--r--Documentation/revisions.txt4
-rw-r--r--Documentation/technical/api-merge.txt71
-rw-r--r--Documentation/technical/api-parse-options.txt9
-rw-r--r--Documentation/technical/api-sigchain.txt41
-rw-r--r--Documentation/user-manual.txt64
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL13
-rw-r--r--Makefile136
l---------RelNotes2
-rw-r--r--abspath.c6
-rw-r--r--archive.c6
-rw-r--r--attr.c52
-rw-r--r--branch.h4
-rw-r--r--builtin.h13
-rw-r--r--builtin/add.c12
-rw-r--r--builtin/apply.c71
-rw-r--r--builtin/blame.c65
-rw-r--r--builtin/branch.c8
-rw-r--r--builtin/bundle.c4
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/checkout-index.c11
-rw-r--r--builtin/checkout.c20
-rw-r--r--builtin/clean.c14
-rw-r--r--builtin/clone.c2
-rw-r--r--