Merge branch 'gitmaster'
commit477f7a5e25b4010f3136683500d07f0d4edf78e9
authorJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Mon, 25 Oct 2010 23:21:47 +0000 (25 16:21 -0700)
committerJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Wed, 27 Oct 2010 18:58:26 +0000 (27 11:58 -0700)
tree7695521222701cfcfd2b7539a2d28f2902870a5d
parentb1ab8b5d1748b0174fb7014651f0f91de3b4c05a
Merge branch 'gitmaster'

Conflicts:
.gitignore
Makefile
gitweb/Makefile
gitweb/gitweb.perl

conflicts resolved
840 files changed:
.gitignore
.mailmap
Documentation/CodingGuidelines
Documentation/Makefile
Documentation/RelNotes/1.5.0.1.txt [moved from Documentation/RelNotes-1.5.0.1.txt with 100% similarity]
Documentation/RelNotes/1.5.0.2.txt [moved from Documentation/RelNotes-1.5.0.2.txt with 100% similarity]
Documentation/RelNotes/1.5.0.3.txt [moved from Documentation/RelNotes-1.5.0.3.txt with 100% similarity]
Documentation/RelNotes/1.5.0.4.txt [moved from Documentation/RelNotes-1.5.0.4.txt with 100% similarity]
Documentation/RelNotes/1.5.0.5.txt [moved from Documentation/RelNotes-1.5.0.5.txt with 100% similarity]
Documentation/RelNotes/1.5.0.6.txt [moved from Documentation/RelNotes-1.5.0.6.txt with 100% similarity]
Documentation/RelNotes/1.5.0.7.txt [moved from Documentation/RelNotes-1.5.0.7.txt with 100% similarity]
Documentation/RelNotes/1.5.0.txt [moved from Documentation/RelNotes-1.5.0.txt with 100% similarity]
Documentation/RelNotes/1.5.1.1.txt [moved from Documentation/RelNotes-1.5.1.1.txt with 100% similarity]
Documentation/RelNotes/1.5.1.2.txt [moved from Documentation/RelNotes-1.5.1.2.txt with 100% similarity]
Documentation/RelNotes/1.5.1.3.txt [moved from Documentation/RelNotes-1.5.1.3.txt with 100% similarity]
Documentation/RelNotes/1.5.1.4.txt [moved from Documentation/RelNotes-1.5.1.4.txt with 100% similarity]
Documentation/RelNotes/1.5.1.5.txt [moved from Documentation/RelNotes-1.5.1.5.txt with 100% similarity]
Documentation/RelNotes/1.5.1.6.txt [moved from Documentation/RelNotes-1.5.1.6.txt with 100% similarity]
Documentation/RelNotes/1.5.1.txt [moved from Documentation/RelNotes-1.5.1.txt with 100% similarity]
Documentation/RelNotes/1.5.2.1.txt [moved from Documentation/RelNotes-1.5.2.1.txt with 100% similarity]
Documentation/RelNotes/1.5.2.2.txt [moved from Documentation/RelNotes-1.5.2.2.txt with 100% similarity]
Documentation/RelNotes/1.5.2.3.txt [moved from Documentation/RelNotes-1.5.2.3.txt with 100% similarity]
Documentation/RelNotes/1.5.2.4.txt [moved from Documentation/RelNotes-1.5.2.4.txt with 100% similarity]
Documentation/RelNotes/1.5.2.5.txt [moved from Documentation/RelNotes-1.5.2.5.txt with 100% similarity]
Documentation/RelNotes/1.5.2.txt [moved from Documentation/RelNotes-1.5.2.txt with 100% similarity]
Documentation/RelNotes/1.5.3.1.txt [moved from Documentation/RelNotes-1.5.3.1.txt with 100% similarity]
Documentation/RelNotes/1.5.3.2.txt [moved from Documentation/RelNotes-1.5.3.2.txt with 100% similarity]
Documentation/RelNotes/1.5.3.3.txt [moved from Documentation/RelNotes-1.5.3.3.txt with 100% similarity]
Documentation/RelNotes/1.5.3.4.txt [moved from Documentation/RelNotes-1.5.3.4.txt with 100% similarity]
Documentation/RelNotes/1.5.3.5.txt [moved from Documentation/RelNotes-1.5.3.5.txt with 100% similarity]
Documentation/RelNotes/1.5.3.6.txt [moved from Documentation/RelNotes-1.5.3.6.txt with 100% similarity]
Documentation/RelNotes/1.5.3.7.txt [moved from Documentation/RelNotes-1.5.3.7.txt with 100% similarity]
Documentation/RelNotes/1.5.3.8.txt [moved from Documentation/RelNotes-1.5.3.8.txt with 100% similarity]
Documentation/RelNotes/1.5.3.txt [moved from Documentation/RelNotes-1.5.3.txt with 100% similarity]
Documentation/RelNotes/1.5.4.1.txt [moved from Documentation/RelNotes-1.5.4.1.txt with 100% similarity]
Documentation/RelNotes/1.5.4.2.txt [moved from Documentation/RelNotes-1.5.4.2.txt with 100% similarity]
Documentation/RelNotes/1.5.4.3.txt [moved from Documentation/RelNotes-1.5.4.3.txt with 100% similarity]
Documentation/RelNotes/1.5.4.4.txt [moved from Documentation/RelNotes-1.5.4.4.txt with 100% similarity]
Documentation/RelNotes/1.5.4.5.txt [moved from Documentation/RelNotes-1.5.4.5.txt with 100% similarity]
Documentation/RelNotes/1.5.4.6.txt [moved from Documentation/RelNotes-1.5.4.6.txt with 100% similarity]
Documentation/RelNotes/1.5.4.7.txt [moved from Documentation/RelNotes-1.5.4.7.txt with 100% similarity]
Documentation/RelNotes/1.5.4.txt [moved from Documentation/RelNotes-1.5.4.txt with 100% similarity]
Documentation/RelNotes/1.5.5.1.txt [moved from Documentation/RelNotes-1.5.5.1.txt with 100% similarity]
Documentation/RelNotes/1.5.5.2.txt [moved from Documentation/RelNotes-1.5.5.2.txt with 100% similarity]
Documentation/RelNotes/1.5.5.3.txt [moved from Documentation/RelNotes-1.5.5.3.txt with 100% similarity]
Documentation/RelNotes/1.5.5.4.txt [moved from Documentation/RelNotes-1.5.5.4.txt with 100% similarity]
Documentation/RelNotes/1.5.5.5.txt [moved from Documentation/RelNotes-1.5.5.5.txt with 100% similarity]
Documentation/RelNotes/1.5.5.6.txt [moved from Documentation/RelNotes-1.5.5.6.txt with 100% similarity]
Documentation/RelNotes/1.5.5.txt [moved from Documentation/RelNotes-1.5.5.txt with 100% similarity]
Documentation/RelNotes/1.5.6.1.txt [moved from Documentation/RelNotes-1.5.6.1.txt with 100% similarity]
Documentation/RelNotes/1.5.6.2.txt [moved from Documentation/RelNotes-1.5.6.2.txt with 100% similarity]
Documentation/RelNotes/1.5.6.3.txt [moved from Documentation/RelNotes-1.5.6.3.txt with 96% similarity]
Documentation/RelNotes/1.5.6.4.txt [moved from Documentation/RelNotes-1.5.6.4.txt with 100% similarity]
Documentation/RelNotes/1.5.6.5.txt [moved from Documentation/RelNotes-1.5.6.5.txt with 100% similarity]
Documentation/RelNotes/1.5.6.6.txt [moved from Documentation/RelNotes-1.5.6.6.txt with 100% similarity]
Documentation/RelNotes/1.5.6.txt [moved from Documentation/RelNotes-1.5.6.txt with 100% similarity]
Documentation/RelNotes/1.6.0.1.txt [moved from Documentation/RelNotes-1.6.0.1.txt with 100% similarity]
Documentation/RelNotes/1.6.0.2.txt [moved from Documentation/RelNotes-1.6.0.2.txt with 97% similarity]
Documentation/RelNotes/1.6.0.3.txt [moved from Documentation/RelNotes-1.6.0.3.txt with 100% similarity]
Documentation/RelNotes/1.6.0.4.txt [moved from Documentation/RelNotes-1.6.0.4.txt with 100% similarity]
Documentation/RelNotes/1.6.0.5.txt [moved from Documentation/RelNotes-1.6.0.5.txt with 100% similarity]
Documentation/RelNotes/1.6.0.6.txt [moved from Documentation/RelNotes-1.6.0.6.txt with 100% similarity]
Documentation/RelNotes/1.6.0.txt [moved from Documentation/RelNotes-1.6.0.txt with 100% similarity]
Documentation/RelNotes/1.6.1.1.txt [moved from Documentation/RelNotes-1.6.1.1.txt with 100% similarity]
Documentation/RelNotes/1.6.1.2.txt [moved from Documentation/RelNotes-1.6.1.2.txt with 100% similarity]
Documentation/RelNotes/1.6.1.3.txt [moved from Documentation/RelNotes-1.6.1.3.txt with 100% similarity]
Documentation/RelNotes/1.6.1.4.txt [moved from Documentation/RelNotes-1.6.1.4.txt with 100% similarity]
Documentation/RelNotes/1.6.1.txt [moved from Documentation/RelNotes-1.6.1.txt with 100% similarity]
Documentation/RelNotes/1.6.2.1.txt [moved from Documentation/RelNotes-1.6.2.1.txt with 100% similarity]
Documentation/RelNotes/1.6.2.2.txt [moved from Documentation/RelNotes-1.6.2.2.txt with 100% similarity]
Documentation/RelNotes/1.6.2.3.txt [moved from Documentation/RelNotes-1.6.2.3.txt with 100% similarity]
Documentation/RelNotes/1.6.2.4.txt [moved from Documentation/RelNotes-1.6.2.4.txt with 100% similarity]
Documentation/RelNotes/1.6.2.5.txt [moved from Documentation/RelNotes-1.6.2.5.txt with 100% similarity]
Documentation/RelNotes/1.6.2.txt [moved from Documentation/RelNotes-1.6.2.txt with 100% similarity]
Documentation/RelNotes/1.6.3.1.txt [moved from Documentation/RelNotes-1.6.3.1.txt with 100% similarity]
Documentation/RelNotes/1.6.3.2.txt [moved from Documentation/RelNotes-1.6.3.2.txt with 100% similarity]
Documentation/RelNotes/1.6.3.3.txt [moved from Documentation/RelNotes-1.6.3.3.txt with 100% similarity]
Documentation/RelNotes/1.6.3.4.txt [moved from Documentation/RelNotes-1.6.3.4.txt with 100% similarity]
Documentation/RelNotes/1.6.3.txt [moved from Documentation/RelNotes-1.6.3.txt with 100% similarity]
Documentation/RelNotes/1.6.4.1.txt [moved from Documentation/RelNotes-1.6.4.1.txt with 100% similarity]
Documentation/RelNotes/1.6.4.2.txt [moved from Documentation/RelNotes-1.6.4.2.txt with 100% similarity]
Documentation/RelNotes/1.6.4.3.txt [moved from Documentation/RelNotes-1.6.4.3.txt with 94% similarity]
Documentation/RelNotes/1.6.4.4.txt [moved from Documentation/RelNotes-1.6.4.4.txt with 100% similarity]
Documentation/RelNotes/1.6.4.txt [moved from Documentation/RelNotes-1.6.4.txt with 100% similarity]
Documentation/RelNotes/1.6.5.1.txt [moved from Documentation/RelNotes-1.6.5.1.txt with 100% similarity]
Documentation/RelNotes/1.6.5.2.txt [moved from Documentation/RelNotes-1.6.5.2.txt with 100% similarity]
Documentation/RelNotes/1.6.5.3.txt [moved from Documentation/RelNotes-1.6.5.3.txt with 100% similarity]
Documentation/RelNotes/1.6.5.4.txt [moved from Documentation/RelNotes-1.6.5.4.txt with 99% similarity]
Documentation/RelNotes/1.6.5.5.txt [moved from Documentation/RelNotes-1.6.5.5.txt with 100% similarity]
Documentation/RelNotes/1.6.5.6.txt [moved from Documentation/RelNotes-1.6.5.6.txt with 100% similarity]
Documentation/RelNotes/1.6.5.7.txt [moved from Documentation/RelNotes-1.6.5.7.txt with 98% similarity]
Documentation/RelNotes/1.6.5.8.txt [moved from Documentation/RelNotes-1.6.5.8.txt with 100% similarity]
Documentation/RelNotes/1.6.5.txt [moved from Documentation/RelNotes-1.6.5.txt with 100% similarity]
Documentation/RelNotes/1.6.6.1.txt [moved from Documentation/RelNotes-1.6.6.1.txt with 100% similarity]
Documentation/RelNotes/1.6.6.2.txt [moved from Documentation/RelNotes-1.6.6.2.txt with 100% similarity]
Documentation/RelNotes/1.6.6.txt [moved from Documentation/RelNotes-1.6.6.txt with 98% similarity]
Documentation/RelNotes/1.7.0.1.txt [moved from Documentation/RelNotes-1.7.0.1.txt with 100% similarity]
Documentation/RelNotes/1.7.0.2.txt [moved from Documentation/RelNotes-1.7.0.2.txt with 100% similarity]
Documentation/RelNotes/1.7.0.3.txt [moved from Documentation/RelNotes-1.7.0.3.txt with 87% similarity]
Documentation/RelNotes/1.7.0.4.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.5.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.6.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.7.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.0.txt [moved from Documentation/RelNotes-1.7.0.txt with 99% similarity]
Documentation/RelNotes/1.7.1.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.1.txt [moved from Documentation/RelNotes-1.7.1.txt with 53% similarity]
Documentation/RelNotes/1.7.2.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.1.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.2.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.3.txt [new file with mode: 0644]
Documentation/RelNotes/1.7.4.txt [new file with mode: 0644]
Documentation/SubmittingPatches
Documentation/asciidoc.conf
Documentation/blame-options.txt
Documentation/config.txt
Documentation/diff-generate-patch.txt
Documentation/diff-options.txt
Documentation/docbook.xsl
Documentation/everyday.txt
Documentation/fetch-options.txt
Documentation/git-add.txt
Documentation/git-am.txt
Documentation/git-apply.txt
Documentation/git-archimport.txt
Documentation/git-archive.txt
Documentation/git-bisect-lk2009.txt
Documentation/git-branch.txt
Documentation/git-bundle.txt
Documentation/git-cat-file.txt
Documentation/git-check-ref-format.txt
Documentation/git-checkout-index.txt
Documentation/git-checkout.txt
Documentation/git-cherry-pick.txt
Documentation/git-clean.txt
Documentation/git-clone.txt
Documentation/git-commit-tree.txt
Documentation/git-commit.txt
Documentation/git-cvsexportcommit.txt
Documentation/git-cvsimport.txt
Documentation/git-cvsserver.txt
Documentation/git-daemon.txt
Documentation/git-describe.txt
Documentation/git-diff.txt
Documentation/git-fast-export.txt
Documentation/git-fast-import.txt
Documentation/git-fetch.txt
Documentation/git-filter-branch.txt
Documentation/git-fmt-merge-msg.txt
Documentation/git-for-each-ref.txt
Documentation/git-format-patch.txt
Documentation/git-gc.txt
Documentation/git-grep.txt
Documentation/git-hash-object.txt
Documentation/git-help.txt
Documentation/git-http-backend.txt
Documentation/git-imap-send.txt
Documentation/git-index-pack.txt
Documentation/git-init.txt
Documentation/git-instaweb.txt
Documentation/git-log.txt
Documentation/git-ls-files.txt
Documentation/git-ls-tree.txt
Documentation/git-mailinfo.txt
Documentation/git-mailsplit.txt
Documentation/git-merge-base.txt
Documentation/git-merge-index.txt
Documentation/git-merge.txt
Documentation/git-mergetool--lib.txt
Documentation/git-mergetool.txt
Documentation/git-notes.txt
Documentation/git-pack-objects.txt
Documentation/git-prune.txt
Documentation/git-pull.txt
Documentation/git-push.txt
Documentation/git-read-tree.txt
Documentation/git-rebase.txt
Documentation/git-reflog.txt
Documentation/git-relink.txt
Documentation/git-remote-helpers.txt
Documentation/git-remote.txt
Documentation/git-repack.txt
Documentation/git-request-pull.txt
Documentation/git-rerere.txt
Documentation/git-reset.txt
Documentation/git-rev-list.txt
Documentation/git-rev-parse.txt
Documentation/git-revert.txt
Documentation/git-rm.txt
Documentation/git-send-email.txt
Documentation/git-shell.txt
Documentation/git-shortlog.txt
Documentation/git-show-branch.txt
Documentation/git-show-ref.txt
Documentation/git-show.txt
Documentation/git-stash.txt
Documentation/git-status.txt
Documentation/git-submodule.txt
Documentation/git-svn.txt
Documentation/git-update-index.txt
Documentation/git-web--browse.txt
Documentation/git.txt
Documentation/gitattributes.txt
Documentation/gitcore-tutorial.txt
Documentation/gitdiffcore.txt
Documentation/githooks.txt
Documentation/gitignore.txt
Documentation/gitk.txt
Documentation/gitmodules.txt
Documentation/gitrepository-layout.txt
Documentation/gitrevisions.txt [new file with mode: 0644]
Documentation/howto/revert-a-faulty-merge.txt
Documentation/howto/revert-branch-rebase.txt
Documentation/install-webdoc.sh
Documentation/merge-config.txt
Documentation/merge-options.txt
Documentation/merge-strategies.txt
Documentation/pretty-formats.txt
Documentation/pretty-options.txt
Documentation/rev-list-options.txt
Documentation/revisions.txt [new file with mode: 0644]
Documentation/technical/api-merge.txt [new file with mode: 0644]
Documentation/technical/api-parse-options.txt
Documentation/technical/api-run-command.txt
Documentation/technical/api-string-list.txt
Documentation/technical/api-tree-walking.txt
Documentation/technical/pack-protocol.txt
Documentation/technical/protocol-capabilities.txt
Documentation/urls.txt
Documentation/user-manual.txt
GIT-VERSION-GEN
INSTALL
Makefile
RelNotes
abspath.c
aclocal.m4 [new file with mode: 0644]
alias.c
archive.c
attr.c
attr.h
base85.c
bisect.c
block-sha1/sha1.c
branch.c
builtin.h
builtin/add.c
builtin/apply.c
builtin/blame.c
builtin/branch.c
builtin/bundle.c
builtin/cat-file.c
builtin/check-ref-format.c
builtin/checkout-index.c
builtin/checkout.c
builtin/clean.c
builtin/clone.c
builtin/commit-tree.c
builtin/commit.c
builtin/config.c
builtin/describe.c
builtin/diff-files.c
builtin/diff-index.c
builtin/diff-tree.c
builtin/diff.c
builtin/fast-export.c
builtin/fetch.c
builtin/fmt-merge-msg.c
builtin/for-each-ref.c
builtin/grep.c
builtin/help.c
builtin/index-pack.c
builtin/init-db.c
builtin/log.c
builtin/ls-files.c
builtin/ls-remote.c
builtin/ls-tree.c
builtin/mailinfo.c
builtin/mailsplit.c
builtin/merge-base.c
builtin/merge-file.c
builtin/merge-recursive.c
builtin/merge-tree.c
builtin/merge.c
builtin/mv.c
builtin/name-rev.c
builtin/notes.c
builtin/pack-objects.c
builtin/patch-id.c
builtin/prune.c
builtin/push.c
builtin/read-tree.c
builtin/receive-pack.c
builtin/reflog.c
builtin/remote.c
builtin/rerere.c
builtin/reset.c
builtin/rev-list.c
builtin/rev-parse.c
builtin/revert.c
builtin/shortlog.c
builtin/show-branch.c
builtin/show-ref.c
builtin/tag.c
builtin/unpack-objects.c
builtin/update-index.c
builtin/var.c
bundle.c
cache-tree.c
cache.h
color.c
color.h
combine-diff.c
commit.c
commit.h
compat/bswap.h
compat/mingw.c
compat/mingw.h
compat/nedmalloc/malloc.c.h
compat/regex/regcomp.c [new file with mode: 0644]
compat/regex/regex.c
compat/regex/regex.h
compat/regex/regex_internal.c [new file with mode: 0644]
compat/regex/regex_internal.h [new file with mode: 0644]
compat/regex/regexec.c [new file with mode: 0644]
compat/strtok_r.c [new file with mode: 0644]
compat/vcbuild/include/termios.h [new file with mode: 0644]
compat/win32/pthread.c
compat/win32/pthread.h
compat/win32mmap.c
config.c
config.mak.in
configure.ac
connect.c
contrib/ciabot/README [new file with mode: 0644]
contrib/ciabot/ciabot.py [new file with mode: 0755]
contrib/ciabot/ciabot.sh [new file with mode: 0755]
contrib/completion/git-completion.bash
contrib/examples/git-commit.sh
contrib/examples/git-fetch.sh
contrib/examples/git-merge.sh
contrib/examples/git-revert.sh
contrib/examples/git-svnimport.perl
contrib/fast-import/import-zips.py
contrib/git-resurrect.sh
contrib/git-shell-commands/README [new file with mode: 0644]
contrib/git-shell-commands/help [new file with mode: 0755]
contrib/git-shell-commands/list [new file with mode: 0755]
contrib/hg-to-git/hg-to-git.py
contrib/hooks/post-receive-email
contrib/p4import/git-p4import.py
contrib/svn-fe/.gitignore [new file with mode: 0644]
contrib/svn-fe/Makefile [new file with mode: 0644]
contrib/svn-fe/svn-fe.c [new file with mode: 0644]
contrib/svn-fe/svn-fe.txt [new file with mode: 0644]
contrib/workdir/git-new-workdir
convert.c
ctype.c
daemon.c
date.c
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c
dir.h
environment.c
exec_cmd.c
fast-import.c
fsck.c
git-add--interactive.perl
git-am.sh
git-compat-util.h
git-cvsimport.perl
git-cvsserver.perl
git-difftool.perl
git-filter-branch.sh
git-gui/GIT-VERSION-GEN
git-gui/Makefile
git-gui/git-gui--askpass
git-gui/git-gui.sh
git-gui/lib/blame.tcl
git-gui/lib/choose_repository.tcl
git-gui/lib/diff.tcl
git-gui/lib/option.tcl
git-gui/lib/shortcut.tcl
git-gui/lib/status_bar.tcl
git-gui/lib/win32.tcl
git-gui/po/sv.po
git-gui/windows/git-gui.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-mergetool--lib.sh
git-mergetool.sh
git-pull.sh
git-rebase--interactive.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.py [new file with mode: 0644]
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c
git.spec.in
git_remote_helpers/Makefile
git_remote_helpers/git/exporter.py [new file with mode: 0644]
git_remote_helpers/git/importer.py [new file with mode: 0644]
git_remote_helpers/git/non_local.py [new file with mode: 0644]
git_remote_helpers/git/repo.py [new file with mode: 0644]
git_remote_helpers/setup.cfg [new file with mode: 0644]
gitk-git/gitk
gitk-git/po/de.po
gitk-git/po/es.po
gitk-git/po/fr.po
gitk-git/po/hu.po
gitk-git/po/it.po
gitk-git/po/ja.po
gitk-git/po/ru.po
gitk-git/po/sv.po
gitweb/INSTALL
gitweb/Makefile
gitweb/README
gitweb/gitweb.perl
gitweb/gitweb_defaults.perl
gitweb/static/git-favicon.png [moved from gitweb/git-favicon.png with 100% similarity]
gitweb/static/git-logo.png [moved from gitweb/git-logo.png with 100% similarity]
gitweb/static/gitweb.css [moved from gitweb/gitweb.css with 93% similarity]
gitweb/static/gitweb.js [moved from gitweb/gitweb.js with 100% similarity]
graph.c
graph.h
grep.c
grep.h
help.h
http-backend.c
http-push.c
http-walker.c
http.c
http.h
imap-send.c
ll-merge.c
ll-merge.h
log-tree.c
log-tree.h
mailmap.c
merge-file.c
merge-recursive.c
merge-recursive.h
notes-cache.c [new file with mode: 0644]
notes-cache.h [new file with mode: 0644]
notes.c
notes.h
object.c
object.h
pack-check.c
pack-refs.c
pack.h
parse-options.c
parse-options.h
path.c
perl/Git.pm
perl/Makefile
pretty.c
quote.c
quote.h
reachable.c
read-cache.c
reflog-walk.c
refs.c
refs.h
remote-curl.c
remote.c
remote.h
rerere.c
resolve-undo.c
revision.c
revision.h
run-command.c
run-command.h
server-info.c
setup.c
sha1_file.c
sha1_name.c
shallow.c
shell.c
shortlog.h
strbuf.c
strbuf.h
string-list.c
string-list.h
submodule.c
submodule.h
t/.gitignore
t/Makefile
t/README
t/aggregate-results.sh
t/annotate-tests.sh
t/gitweb-lib.sh
t/harness [new file with mode: 0755]
t/lib-cvs.sh
t/lib-git-svn.sh
t/lib-httpd.sh
t/lib-pager.sh [new file with mode: 0644]
t/lib-patch-mode.sh
t/lib-prereq-FILEMODE.sh [new file with mode: 0644]
t/lib-rebase.sh
t/lib-t6000.sh [moved from t/t6000lib.sh with 98% similarity]
t/t0000-basic.sh
t/t0001-init.sh
t/t0003-attributes.sh
t/t0004-unwritable.sh
t/t0005-signals.sh
t/t0006-date.sh
t/t0020-crlf.sh
t/t0021-conversion.sh
t/t0025-crlf-auto.sh [new file with mode: 0755]
t/t0026-eol-config.sh [new file with mode: 0755]
t/t0040-parse-options.sh
t/t0080-vcs-svn.sh [new file with mode: 0755]
t/t1001-read-tree-m-2way.sh
t/t1004-read-tree-m-u-wf.sh
t/t1010-mktree.sh
t/t1011-read-tree-sparse-checkout.sh
t/t1020-subdirectory.sh
t/t1300-repo-config.sh
t/t1302-repo-version.sh
t/t1304-default-acl.sh
t/t1402-check-ref-format.sh
t/t1450-fsck.sh
t/t1501-worktree.sh
t/t1502-rev-parse-parseopt.sh
t/t1503-rev-parse-verify.sh
t/t1506-rev-parse-diagnosis.sh
t/t1509-root-worktree.sh
t/t2007-checkout-symlink.sh
t/t2013-checkout-submodule.sh
t/t2016-checkout-patch.sh
t/t2017-checkout-orphan.sh [new file with mode: 0755]
t/t2018-checkout-branch.sh [new file with mode: 0755]
t/t2101-update-index-reupdate.sh
t/t2102-update-index-symlinks.sh
t/t2105-update-index-gitfile.sh
t/t2106-update-index-assume-unchanged.sh [new file with mode: 0755]
t/t3000-ls-files-others.sh
t/t3020-ls-files-error-unmatch.sh
t/t3030-merge-recursive.sh
t/t3060-ls-files-with-tree.sh
t/t3100-ls-tree-restrict.sh
t/t3101-ls-tree-dirname.sh
t/t3200-branch.sh
t/t3210-pack-refs.sh
t/t3300-funny-names.sh
t/t3301-notes.sh
t/t3302-notes-index-expensive.sh
t/t3306-notes-prune.sh
t/t3307-notes-man.sh [new file with mode: 0755]
t/t3400-rebase.sh
t/t3402-rebase-merge.sh
t/t3404-rebase-interactive.sh
t/t3407-rebase-abort.sh
t/t3409-rebase-preserve-merges.sh
t/t3410-rebase-preserve-dropped-merges.sh
t/t3415-rebase-autosquash.sh
t/t3418-rebase-continue.sh [new file with mode: 0755]
t/t3500-cherry.sh
t/t3501-revert-cherry-pick.sh
t/t3505-cherry-pick-empty.sh
t/t3506-cherry-pick-ff.sh [new file with mode: 0755]
t/t3507-cherry-pick-conflict.sh [new file with mode: 0755]
t/t3508-cherry-pick-many-commits.sh [new file with mode: 0755]
t/t3509-cherry-pick-merge-df.sh [new file with mode: 0755]
t/t3600-rm.sh
t/t3700-add.sh
t/t3701-add-interactive.sh
t/t3902-quoted.sh
t/t3903-stash.sh
t/t3904-stash-patch.sh
t/t4002-diff-basic.sh
t/t4004-diff-rename-symlink.sh
t/t4011-diff-symlink.sh
t/t4013-diff-various.sh
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
t/t4013/diff.log_-GF_-p_--pickaxe-all_master [new file with mode: 0644]
t/t4013/diff.log_-GF_-p_master [new file with mode: 0644]
t/t4013/diff.log_-GF_master [new file with mode: 0644]
t/t4013/diff.log_-S_F_master [new file with mode: 0644]
t/t4013/diff.log_-m_-p_--first-parent_master [new file with mode: 0644]
t/t4013/diff.log_-m_-p_master [new file with mode: 0644]
t/t4013/diff.log_-p_--first-parent_master [new file with mode: 0644]
t/t4013/diff.show_--first-parent_master [new file with mode: 0644]
t/t4013/diff.show_-c_master [new file with mode: 0644]
t/t4013/diff.show_-m_master [new file with mode: 0644]
t/t4014-format-patch.sh
t/t4015-diff-whitespace.sh
t/t4016-diff-quote.sh
t/t4017-diff-retval.sh
t/t4018-diff-funcname.sh
t/t4023-diff-rename-typechange.sh
t/t4027-diff-submodule.sh
t/t4034-diff-words.sh
t/t4038-diff-combined.sh
t/t4041-diff-submodule-option.sh [moved from t/t4041-diff-submodule.sh with 66% similarity]
t/t4042-diff-textconv-caching.sh [new file with mode: 0755]
t/t4043-diff-rename-binary.sh [new file with mode: 0755]
t/t4044-diff-index-unique-abbrev.sh [new file with mode: 0755]
t/t4045-diff-relative.sh [new file with mode: 0755]
t/t4102-apply-rename.sh
t/t4111-apply-subdir.sh [new file with mode: 0755]
t/t4114-apply-typechange.sh
t/t4115-apply-symlink.sh
t/t4120-apply-popt.sh
t/t4122-apply-symlink-inside.sh
t/t4124-apply-ws-rule.sh
t/t4127-apply-same-fn.sh
t/t4129-apply-samemode.sh
t/t4134-apply-submodule.sh [new file with mode: 0755]
t/t4135-apply-weird-filenames.sh [new file with mode: 0755]
t/t4135/.gitignore [new file with mode: 0644]
t/t4135/add-plain.diff [new file with mode: 0644]
t/t4135/add-with backslash.diff [new file with mode: 0644]
t/t4135/add-with quote.diff [new file with mode: 0644]
t/t4135/add-with spaces.diff [new file with mode: 0644]
t/t4135/add-with tab.diff [new file with mode: 0644]
t/t4135/damaged.diff [new file with mode: 0644]
t/t4135/diff-plain.diff [new file with mode: 0644]
t/t4135/diff-with backslash.diff [new file with mode: 0644]
t/t4135/diff-with quote.diff [new file with mode: 0644]
t/t4135/diff-with spaces.diff [new file with mode: 0644]
t/t4135/diff-with tab.diff [new file with mode: 0644]
t/t4135/git-plain.diff [new file with mode: 0644]
t/t4135/git-with backslash.diff [new file with mode: 0644]
t/t4135/git-with quote.diff [new file with mode: 0644]
t/t4135/git-with spaces.diff [new file with mode: 0644]
t/t4135/git-with tab.diff [new file with mode: 0644]
t/t4135/make-patches [new file with mode: 0755]
t/t4150-am.sh
t/t4151-am-abort.sh
t/t4200-rerere.sh
t/t4201-shortlog.sh
t/t4202-log.sh
t/t4204-patch-id.sh
t/t4205-log-pretty-formats.sh [new file with mode: 0755]
t/t4206-log-follow-harder-copies.sh [new file with mode: 0755]
t/t4207-log-decoration-colors.sh [new file with mode: 0755]
t/t4300-merge-tree.sh [new file with mode: 0755]
t/t5000-tar-tree.sh
t/t5001-archive-attr.sh
t/t5150-request-pull.sh [new file with mode: 0755]
t/t5300-pack-object.sh
t/t5302-pack-index.sh
t/t5400-send-pack.sh
t/t5407-post-rewrite-hook.sh [new file with mode: 0755]
t/t5503-tagfollow.sh
t/t5505-remote.sh
t/t5510-fetch.sh
t/t5512-ls-remote.sh
t/t5516-fetch-push.sh
t/t5520-pull.sh
t/t5522-pull-symlink.sh
t/t5525-fetch-tagopt.sh [new file with mode: 0755]
t/t5530-upload-pack-error.sh
t/t5540-http-push.sh
t/t5541-http-push.sh
t/t5550-http-fetch.sh
t/t5551-http-fetch.sh
t/t5560-http-backend-noserver.sh
t/t5561-http-backend.sh
t/t556x_common
t/t5601-clone.sh
t/t5700-clone-reference.sh
t/t5704-bundle.sh
t/t5705-clone-2gb.sh
t/t5800-remote-helpers.sh [new file with mode: 0755]
t/t6001-rev-list-graft.sh
t/t6002-rev-list-bisect.sh
t/t6003-rev-list-topo-order.sh
t/t6006-rev-list-format.sh
t/t6007-rev-list-cherry-pick-file.sh
t/t6010-merge-base.sh
t/t6018-rev-list-glob.sh
t/t6019-rev-list-ancestry-path.sh [new file with mode: 0755]
t/t6020-merge-df.sh
t/t6022-merge-rename.sh
t/t6023-merge-file.sh
t/t6031-merge-recursive.sh
t/t6035-merge-dir-to-symlink.sh
t/t6037-merge-ours-theirs.sh
t/t6038-merge-text-auto.sh [new file with mode: 0755]
t/t6050-replace.sh
t/t6101-rev-parse-parents.sh
t/t6120-describe.sh
t/t6200-fmt-merge-msg.sh
t/t6300-for-each-ref.sh
t/t7003-filter-branch.sh
t/t7004-tag.sh
t/t7005-editor.sh
t/t7006-pager.sh
t/t7008-grep-binary.sh [new file with mode: 0755]
t/t7010-setup.sh
t/t7012-skip-worktree-writing.sh
t/t7105-reset-patch.sh
t/t7201-co.sh
t/t7300-clean.sh
t/t7400-submodule-basic.sh
t/t7401-submodule-summary.sh
t/t7403-submodule-sync.sh
t/t7405-submodule-merge.sh
t/t7406-submodule-update.sh
t/t7407-submodule-foreach.sh
t/t7500-commit.sh
t/t7501-commit.sh
t/t7502-commit.sh
t/t7506-status-submodule.sh
t/t7508-status.sh
t/t7509-commit.sh
t/t7600-merge.sh
t/t7604-merge-custom-message.sh
t/t7606-merge-custom.sh
t/t7607-merge-overwrite.sh
t/t7609-merge-co-error-msgs.sh [new file with mode: 0755]
t/t7610-mergetool.sh
t/t7700-repack.sh
t/t7701-repack-unpack-unreachable.sh
t/t7800-difftool.sh
t/t7810-grep.sh [moved from t/t7002-grep.sh with 90% similarity]
t/t7811-grep-open.sh [new file with mode: 0755]
t/t8006-blame-textconv.sh [new file with mode: 0755]
t/t8007-cat-file-textconv.sh [new file with mode: 0755]
t/t9001-send-email.sh
t/t9010-svn-fe.sh [new file with mode: 0755]
t/t9100-git-svn-basic.sh
t/t9101-git-svn-props.sh
t/t9102-git-svn-deep-rmdir.sh
t/t9104-git-svn-follow-parent.sh
t/t9105-git-svn-commit-diff.sh
t/t9106-git-svn-commit-diff-clobber.sh
t/t9107-git-svn-migrate.sh
t/t9114-git-svn-dcommit-merge.sh
t/t9115-git-svn-dcommit-funky-renames.sh
t/t9116-git-svn-log.sh
t/t9118-git-svn-funky-branch-names.sh
t/t9119-git-svn-info.sh
t/t9120-git-svn-clone-with-percent-escapes.sh
t/t9123-git-svn-rebuild-with-rewriteroot.sh
t/t9125-git-svn-multi-glob-branch-names.sh
t/t9127-git-svn-partial-rebuild.sh
t/t9128-git-svn-cmd-branch.sh
t/t9129-git-svn-i18n-commitencoding.sh
t/t9130-git-svn-authors-file.sh
t/t9131-git-svn-empty-symlink.sh
t/t9137-git-svn-dcommit-clobber-series.sh
t/t9139-git-svn-non-utf8-commitencoding.sh
t/t9140-git-svn-reset.sh
t/t9143-git-svn-gc.sh
t/t9155-git-svn-fetch-deleted-tag.sh [new file with mode: 0755]
t/t9156-git-svn-fetch-deleted-tag-2.sh [new file with mode: 0755]
t/t9157-git-svn-fetch-merge.sh [new file with mode: 0755]
t/t9200-git-cvsexportcommit.sh
t/t9300-fast-import.sh
t/t9350-fast-export.sh
t/t9400-git-cvsserver-server.sh
t/t9401-git-cvsserver-crlf.sh
t/t9500-gitweb-standalone-no-errors.sh
t/t9600-cvsimport.sh
t/t9601-cvsimport-vendor-branch.sh
t/t9602-cvsimport-branches-tags.sh
t/t9603-cvsimport-patchsets.sh
t/t9700-perl-git.sh
t/t9700/test.pl
t/test-lib.sh
tag.c
tag.h
templates/Makefile
templates/hooks--commit-msg.sample
templates/hooks--post-update.sample
templates/hooks--pre-commit.sample
templates/hooks--pre-rebase.sample
templates/hooks--prepare-commit-msg.sample
templates/hooks--update.sample
templates/info--exclude
test-date.c
test-line-buffer.c [new file with mode: 0644]
test-obj-pool.c [new file with mode: 0644]
test-string-pool.c [new file with mode: 0644]
test-svn-fe.c [new file with mode: 0644]
test-treap.c [new file with mode: 0644]
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c
tree-diff.c
tree-walk.c
tree-walk.h
unpack-trees.c
unpack-trees.h
upload-pack.c
url.c [new file with mode: 0644]
url.h [new file with mode: 0644]
usage.c
userdiff.c
userdiff.h
vcs-svn/LICENSE [new file with mode: 0644]
vcs-svn/fast_export.c [new file with mode: 0644]
vcs-svn/fast_export.h [new file with mode: 0644]
vcs-svn/line_buffer.c [new file with mode: 0644]
vcs-svn/line_buffer.h [new file with mode: 0644]
vcs-svn/line_buffer.txt [new file with mode: 0644]
vcs-svn/obj_pool.h [new file with mode: 0644]
vcs-svn/repo_tree.c [new file with mode: 0644]
vcs-svn/repo_tree.h [new file with mode: 0644]
vcs-svn/string_pool.c [new file with mode: 0644]
vcs-svn/string_pool.h [new file with mode: 0644]
vcs-svn/string_pool.txt [new file with mode: 0644]
vcs-svn/svndump.c [new file with mode: 0644]
vcs-svn/svndump.h [new file with mode: 0644]
vcs-svn/trp.h [new file with mode: 0644]
vcs-svn/trp.txt [new file with mode: 0644]
wrapper.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
xdiff/xdiff.h
xdiff/xmacros.h
xdiff/xmerge.c
xdiff/xutils.c