summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Documentation/RelNotes/1.7.5.2.txt33
-rw-r--r--Documentation/RelNotes/1.7.6.txt121
-rw-r--r--Documentation/SubmittingPatches207
-rw-r--r--Documentation/config.txt109
-rw-r--r--Documentation/diff-config.txt136
-rw-r--r--Documentation/diff-options.txt82
-rw-r--r--Documentation/git-add.txt6
-rw-r--r--Documentation/git-blame.txt7
-rw-r--r--Documentation/git-checkout.txt7
-rw-r--r--Documentation/git-cherry-pick.txt7
-rw-r--r--Documentation/git-format-patch.txt232
-rw-r--r--Documentation/git-imap-send.txt29
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-merge-base.txt34
-rw-r--r--Documentation/git-notes.txt7
-rw-r--r--Documentation/git-rebase.txt11
-rw-r--r--Documentation/git-reset.txt7
-rw-r--r--Documentation/git-send-email.txt19
-rw-r--r--Documentation/git-stash.txt9
-rw-r--r--Documentation/git-submodule.txt6
-rw-r--r--Documentation/git-svn.txt48
-rw-r--r--Documentation/git.txt14
-rw-r--r--Documentation/pretty-options.txt35
-rw-r--r--Documentation/rev-list-options.txt5
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile89
l---------RelNotes2
-rw-r--r--archive.c18
-rw-r--r--attr.c4
-rw-r--r--builtin/add.c45
-rw-r--r--builtin/apply.c9
-rw-r--r--builtin/blame.c11
-rw-r--r--builtin/checkout.c29
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/diff-tree.c12
-rw-r--r--builtin/diff.c4
-rw-r--r--builtin/grep.c12
-rw-r--r--builtin/index-pack.c2
-rw-r--r--builtin/init-db.c10
-rw-r--r--builtin/log.c103
-rw-r--r--builtin/ls-files.c9
-rw-r--r--builtin/ls-tree.c13
-rw-r--r--builtin/merge-base.c3
-rw-r--r--builtin/merge-tree.c3
-rw-r--r--builtin/merge.c66
-rw-r--r--builtin/notes.c30
-rw-r--r--builtin/rerere.c77
-rw-r--r--builtin/rev-list.c10
-rw-r--r--builtin/send-pack.c5
-rw-r--r--builtin/shortlog.c3
-rw-r--r--builtin/show-branch.c16
-rw-r--r--cache.h20
-rw-r--r--color.c22
-rw-r--r--color.h3
-rw-r--r--commit.h2
-rw-r--r--config.c18
-rwxr-xr-xcontrib/completion/git-completion.bash239
-rw-r--r--diff-lib.c15
-rw-r--r--diff.c228
-rw-r--r--diff.h11
-rw-r--r--diffcore-rename.c114
-rw-r--r--dir.c76
-rw-r--r--dir.h2
-rw-r--r--fast-import.c6
-rwxr-xr-xgit-add--interactive.perl25
-rwxr-xr-xgit-cvsimport.perl53
-rwxr-xr-xgit-merge-one-file.sh7
-rw-r--r--git-mergetool--lib.sh9
-rwxr-xr-xgit-mergetool.sh90
-rw-r--r--git-parse-remote.sh38
-rwxr-xr-xgit-pull.sh32
-rw-r--r--git-rebase--am.sh30
-rw-r--r--[-rwxr-xr-x]git-rebase--interactive.sh751
-rw-r--r--git-rebase--merge.sh151
-rwxr-xr-xgit-rebase.sh594
-rwxr-xr-xgit-submodule.sh14
-rwxr-xr-xgit-svn.perl17
-rw-r--r--git.c18
-rwxr-xr-xgitweb/gitweb.perl399
-rw-r--r--graph.c23
-rw-r--r--http-push.c152
-rw-r--r--http-walker.c4
-rw-r--r--http.c12
-rw-r--r--http.h6
-rw-r--r--imap-send.c4
-rw-r--r--list-objects.c18
-rw-r--r--merge-file.c1
-rw-r--r--merge-file.h7
-rw-r--r--merge-recursive.c38
-rw-r--r--notes.c17
-rw-r--r--notes.h9
-rw-r--r--pretty.c70
-rw-r--r--remote-curl.c2
-rw-r--r--rerere.c84
-rw-r--r--rerere.h2
-rw-r--r--revision.c172
-rw-r--r--revision.h1
-rw-r--r--run-command.c15
-rw-r--r--setup.c7
-rw-r--r--strbuf.c4
-rw-r--r--strbuf.h7
-rw-r--r--t/README17
-rw-r--r--t/annotate-tests.sh13
-rw-r--r--t/lib-httpd.sh5
-rwxr-xr-xt/t0001-init.sh10
-rwxr-xr-xt/t0061-run-command.sh23
-rwxr-xr-xt/t1020-subdirectory.sh21
-rwxr-xr-xt/t1200-tutorial.sh4
-rwxr-xr-xt/t1303-wacky-config.sh2
-rwxr-xr-xt/t1400-update-ref.sh2
-rwxr-xr-xt/t1501-worktree.sh7
-rwxr-xr-xt/t1506-rev-parse-diagnosis.sh7
-rwxr-xr-xt/t2011-checkout-invalid-head.sh2
-rwxr-xr-xt/t2019-checkout-ambiguous-ref.sh12
-rwxr-xr-xt/t2020-checkout-detach.sh19
-rwxr-xr-xt/t2200-add-update.sh28
-rwxr-xr-xt/t2201-add-update-typechange.sh2
-rwxr-xr-xt/t2204-add-ignored.sh16
-rwxr-xr-xt/t3030-merge-recursive.sh8
-rwxr-xr-xt/t3102-ls-tree-wildcards.sh22
-rwxr-xr-xt/t3200-branch.sh10
-rwxr-xr-xt/t3203-branch-output.sh4
-rwxr-xr-xt/t3301-notes.sh67
-rwxr-xr-xt/t3400-rebase.sh27
-rwxr-xr-xt/t3403-rebase-skip.sh5
-rwxr-xr-xt/t3407-rebase-abort.sh10
-rwxr-xr-xt/t3409-rebase-preserve-merges.sh32
-rwxr-xr-xt/t3418-rebase-continue.sh55
-rwxr-xr-xt/t3501-revert-cherry-pick.sh4
-rwxr-xr-xt/t3507-cherry-pick-conflict.sh4
-rwxr-xr-xt/t3600-rm.sh3
-rwxr-xr-xt/t3700-add.sh10
-rwxr-xr-x