summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--Documentation/Makefile8
-rw-r--r--Documentation/RelNotes-1.7.0.6.txt13
-rw-r--r--Documentation/RelNotes-1.7.1.1.txt96
-rw-r--r--Documentation/RelNotes-1.7.1.txt89
-rw-r--r--Documentation/SubmittingPatches90
-rw-r--r--Documentation/blame-options.txt10
-rw-r--r--Documentation/config.txt116
-rw-r--r--Documentation/diff-generate-patch.txt3
-rw-r--r--Documentation/diff-options.txt15
-rw-r--r--Documentation/everyday.txt51
-rw-r--r--Documentation/fetch-options.txt9
-rw-r--r--Documentation/git-add.txt6
-rw-r--r--Documentation/git-am.txt9
-rw-r--r--Documentation/git-branch.txt10
-rw-r--r--Documentation/git-checkout.txt58
-rw-r--r--Documentation/git-cherry-pick.txt6
-rw-r--r--Documentation/git-clone.txt6
-rw-r--r--Documentation/git-commit.txt9
-rw-r--r--Documentation/git-cvsimport.txt18
-rw-r--r--Documentation/git-format-patch.txt11
-rw-r--r--Documentation/git-gc.txt7
-rw-r--r--Documentation/git-grep.txt8
-rw-r--r--Documentation/git-hash-object.txt2
-rw-r--r--Documentation/git-imap-send.txt4
-rw-r--r--Documentation/git-init.txt29
-rw-r--r--Documentation/git-log.txt51
-rw-r--r--Documentation/git-mailinfo.txt8
-rw-r--r--Documentation/git-mailsplit.txt5
-rw-r--r--Documentation/git-merge-file.txt12
-rw-r--r--Documentation/git-merge.txt7
-rw-r--r--Documentation/git-notes.txt254
-rw-r--r--Documentation/git-pull.txt10
-rw-r--r--Documentation/git-push.txt15
-rw-r--r--Documentation/git-rebase.txt55
-rw-r--r--Documentation/git-remote-helpers.txt118
-rw-r--r--Documentation/git-rerere.txt7
-rw-r--r--Documentation/git-reset.txt53
-rw-r--r--Documentation/git-send-email.txt31
-rw-r--r--Documentation/git-shortlog.txt15
-rw-r--r--Documentation/git-show-branch.txt6
-rw-r--r--Documentation/git-status.txt43
-rw-r--r--Documentation/git-update-index.txt2
-rw-r--r--Documentation/git.txt8
-rw-r--r--Documentation/gitdiffcore.txt4
-rw-r--r--Documentation/githooks.txt38
-rw-r--r--Documentation/gitignore.txt14
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt90
-rw-r--r--Documentation/merge-options.txt2
-rw-r--r--Documentation/pretty-formats.txt4
-rw-r--r--Documentation/pretty-options.txt16
-rw-r--r--Documentation/rev-list-options.txt13
-rw-r--r--Documentation/technical/api-parse-options.txt12
-rw-r--r--Documentation/technical/api-string-list.txt6
-rw-r--r--Documentation/urls.txt59
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile564
l---------RelNotes2
-rw-r--r--abspath.c5
-rw-r--r--attr.c38
-rw-r--r--block-sha1/sha1.c8
-rw-r--r--builtin.h21
-rw-r--r--builtin/add.c (renamed from builtin-add.c)0
-rw-r--r--builtin/annotate.c (renamed from builtin-annotate.c)0
-rw-r--r--builtin/apply.c (renamed from builtin-apply.c)18
-rw-r--r--builtin/archive.c (renamed from builtin-archive.c)0
-rw-r--r--builtin/bisect--helper.c (renamed from builtin-bisect--helper.c)0
-rw-r--r--builtin/blame.c (renamed from builtin-blame.c)4
-rw-r--r--builtin/branch.c (renamed from builtin-branch.c)2
-rw-r--r--builtin/bundle.c (renamed from builtin-bundle.c)0
-rw-r--r--builtin/cat-file.c (renamed from builtin-cat-file.c)0
-rw-r--r--builtin/check-attr.c (renamed from builtin-check-attr.c)0
-rw-r--r--builtin/check-ref-format.c (renamed from builtin-check-ref-format.c)0
-rw-r--r--builtin/checkout-index.c (renamed from builtin-checkout-index.c)0
-rw-r--r--builtin/checkout.c (renamed from builtin-checkout.c)27
-rw-r--r--builtin/clean.c (renamed from builtin-clean.c)0
-rw-r--r--builtin/clone.c (renamed from builtin-clone.c)24
-rw-r--r--builtin/commit-tree.c (renamed from builtin-commit-tree.c)0
-rw-r--r--builtin/commit.c (renamed from builtin-commit.c)110
-rw-r--r--builtin/config.c (renamed from builtin-config.c)0
-rw-r--r--builtin/count-objects.c (renamed from builtin-count-objects.c)0
-rw-r--r--builtin/describe.c (renamed from builtin-describe.c)49
-rw-r--r--builtin/diff-files.c (renamed from builtin-diff-files.c)0
-rw-r--r--builtin/diff-index.c (renamed from builtin-diff-index.c)0
-rw-r--r--builtin/diff-tree.c (renamed from builtin-diff-tree.c)18
-rw-r--r--builtin/diff.c (renamed from builtin-diff.c)0
-rw-r--r--builtin/fast-export.c (renamed from builtin-fast-export.c)0
-rw-r--r--builtin/fetch-pack.c (renamed from builtin-fetch-pack.c)0
-rw-r--r--builtin/fetch.c (renamed from builtin-fetch.c)27
-rw-r--r--builtin/fmt-merge-msg.c (renamed from builtin-fmt-merge-msg.c)229
-rw-r--r--builtin/for-each-ref.c (renamed from builtin-for-each-ref.c)81
-rw-r--r--builtin/fsck.c (renamed from builtin-fsck.c)0
-rw-r--r--builtin/gc.c (renamed from builtin-gc.c)0
-rw-r--r--builtin/grep.c (renamed from builtin-grep.c)95
-rw-r--r--builtin/hash-object.c (renamed from builtin-hash-object.c)8
-rw-r--r--builtin/help.c (renamed from builtin-help.c)0
-rw-r--r--builtin/index-pack.c (renamed from builtin-index-pack.c)91
-rw-r--r--builtin/init-db.c (renamed from builtin-init-db.c)25
-rw-r--r--builtin/log.c (renamed from builtin-log.c)199
-rw-r--r--builtin/ls-files.c (renamed from builtin-ls-files.c)82
-rw-r--r--builtin/ls-remote.c (renamed from builtin-ls-remote.c)0
-rw-r--r--builtin/ls-tree.c (renamed from builtin-ls-tree.c)6
-rw-r--r--builtin/mailinfo.c (renamed from builtin-mailinfo.c)3
-rw-r--r--builtin/mailsplit.c (renamed from builtin-mailsplit.c)2
-rw-r--r--builtin/merge-base.c (renamed from builtin-merge-base.c)0
-rw-r--r--builtin/merge-file.c (renamed from builtin-merge-file.c)29
-rw-r--r--builtin/merge-index.c (renamed from builtin-merge-index.c)0
-rw-r--r--builtin/merge-ours.c (renamed from builtin-merge-ours.c)0
-rw-r--r--builtin/merge-recursive.c (renamed from builtin-merge-recursive.c)0
-rw-r--r--builtin/merge-tree.c (renamed from builtin-merge-tree.c)2
-rw-r--r--builtin/merge.c (renamed from builtin-merge.c)22
-rw-r--r--builtin/mktag.c (renamed from builtin-mktag.c)0
-rw-r--r--builtin/mktree.c (renamed from builtin-mktree.c)0
-rw-r--r--builtin/mv.c (renamed from builtin-mv.c)0
-rw-r--r--builtin/name-rev.c (renamed from builtin-name-rev.c)0
-rw-r--r--builtin/notes.c866
-rw-r--r--builtin/pack-objects.c (renamed from builtin-pack-objects.c)44
-rw-r--r--builtin/pack-redundant.c (renamed from builtin-pack-redundant.c)0
-rw-r--r--builtin/pack-refs.c (renamed from builtin-pack-refs.c)0
-rw-r--r--builtin/patch-id.c (renamed from builtin-patch-id.c)0
-rw-r--r--builtin/prune-packed.c (renamed from builtin-prune-packed.c)0
-rw-r--r--builtin/prune.c (renamed from builtin-prune.c)0
-rw-r--r--builtin/push.c (renamed from builtin-push.c)17
-rw-r--r--builtin/read-tree.c (renamed from builtin-read-tree.c)0
-rw-r--r--builtin/receive-pack.c (renamed from builtin-receive-pack.c)0
-rw-r--r--builtin/reflog.c (renamed from builtin-reflog.c)2
-rw-r--r--