Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
John Keeping e01afdb74b t7800: run --dir-diff tests with and without symlinks
Currently the difftool --dir-diff tests may or may not use symlinks
depending on the operating system on which they are run.  In one case
this has caused a test failure to be noticed only on Windows when the
test also fails on Linux when difftool is invoked with --no-symlinks.

Rewrite these tests so that they do not depend on the environment but
run explicitly with both --symlinks and --no-symlinks, protecting the
--symlinks version with a SYMLINKS prerequisite.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-29 15:16:40 -07:00
block-sha1
builtin Merge branch 'maint' 2013-03-27 10:58:07 -07:00
compat Merge branch 'rj/msvc-build' 2013-03-19 12:20:40 -07:00
contrib Merge branch 'jl/submodule-deinit' 2013-03-25 14:00:29 -07:00
Documentation Merge branch 'yd/doc-is-in-asciidoc' 2013-03-28 14:38:20 -07:00
git_remote_helpers
git-gui
gitk-git
gitweb gitweb/README: remove reference to git.kernel.org 2013-03-07 11:38:33 -08:00
mergetools mergetools/p4merge: create a base if none available 2013-03-13 10:46:07 -07:00
perl git-svn: Support custom tunnel schemes instead of SSH only 2013-03-27 04:28:04 +00:00
po l10n: zh_CN.po: translate 1 new message 2013-03-07 08:46:19 +08:00
ppc
t t7800: run --dir-diff tests with and without symlinks 2013-03-29 15:16:40 -07:00
templates templates/hooks--update.sample: use a lowercase "usage:" string 2013-02-24 13:31:09 -08:00
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
abspath.c
aclocal.m4
advice.c Merge branch 'tb/document-status-u-tradeoff' 2013-03-21 14:02:10 -07:00
advice.h Merge branch 'tb/document-status-u-tradeoff' 2013-03-21 14:02:10 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c archive-zip: use deflateInit2() to ask for raw compressed data 2013-03-16 22:07:02 -07:00
archive.c archive: handle commits with an empty tree 2013-03-10 22:25:22 -07:00
archive.h
argv-array.c
argv-array.h
attr.c Sync with 1.8.1.5 2013-03-01 13:17:18 -08:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'jk/fully-peeled-packed-ref' 2013-03-25 14:01:07 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'rs/archive-zip-raw-compression' 2013-03-27 09:28:53 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
column.c
column.h
combine-diff.c Allow combined diff to ignore white-spaces 2013-03-14 14:43:34 -07:00
command-list.txt
commit.c commit.c: use clear_commit_marks_many() in in_merge_bases_many() 2013-03-05 13:39:46 -08:00
commit.h Merge branch 'jc/push-follow-tag' 2013-03-25 14:00:41 -07:00
config.c
config.mak.in Merge branch 'ct/autoconf-htmldir' 2013-02-25 08:27:04 -08:00
config.mak.uname Merge branch 'rj/msvc-build' 2013-03-19 12:20:40 -07:00
configure.ac Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
connect.c
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1 2013-03-25 13:45:42 -07:00
date.c Fix time offset calculation in case of unsigned time_t 2013-02-25 14:29:12 -08:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'ap/maint-diff-rename-avoid-overlap' 2013-03-25 14:00:37 -07:00
diff.h Merge branch 'mp/diff-algo-config' 2013-02-17 15:25:52 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Preallocate hash tables when the number of inserts are known in advance 2013-03-16 22:57:29 -07:00
diffcore.h
dir.c
dir.h
editor.c
entry.c Merge branch 'jk/checkout-attribute-lookup' 2013-03-28 14:37:46 -07:00
environment.c Merge branch 'jk/alias-in-bare' 2013-03-25 14:00:44 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: clarify "inline" logic in file_change_m 2013-03-21 14:06:49 -07:00
fetch-pack.c Merge branch 'jc/fetch-raw-sha1' 2013-03-21 14:02:27 -07:00
fetch-pack.h fetch: use struct ref to represent refs to be fetched 2013-02-07 13:53:59 -08:00
fixup-builtins
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh Merge branch 'jc/fake-ancestor-with-non-blobs' into maint 2013-02-07 15:14:22 -08:00
git-archimport.perl git-archimport: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-bisect.sh
git-compat-util.h Merge branch 'maint-1.8.1' into maint 2013-03-25 13:46:42 -07:00
git-cvsexportcommit.perl git-cvsexportcommit: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsimport.perl git-cvsimport: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsserver.perl git-cvsimport: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-difftool--helper.sh difftool--helper: fix printf usage 2013-02-10 11:35:50 -08:00
git-difftool.perl difftool: don't overwrite modified files 2013-03-29 15:16:04 -07:00
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh Merge branch 'kb/p4merge' 2013-03-26 13:15:24 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh Merge branch 'al/mergetool-printf-fix' 2013-02-14 10:29:37 -08:00
git-p4.py git p4: avoid expanding client paths in chdir 2013-03-11 15:03:11 -07:00
git-parse-remote.sh
git-pull.sh pull: Apply -q and -v options to rebase mode as well 2013-03-16 23:30:08 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'jk/rebase-i-comment-char' 2013-02-17 15:25:20 -08:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl git-relink: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-remote-testgit
git-remote-testpy.py
git-repack.sh
git-request-pull.sh
git-send-email.perl git-send-email: use git credential to obtain password 2013-02-27 09:46:03 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'kb/p4merge' 2013-03-26 13:15:24 -07:00
git-stash.sh
git-submodule.sh Merge branch 'we/submodule-update-prefix-output' into maint 2013-03-26 12:44:27 -07:00
git-svn.perl git-svn: use a lowercase "usage:" string 2013-02-24 21:30:03 -08:00
GIT-VERSION-GEN Start the post 1.8.2 cycle 2013-03-18 15:01:19 -07:00
git-web--browse.sh
git.c Merge branch 'jk/alias-in-bare' 2013-03-25 14:00:44 -07:00
git.spec.in
gpg-interface.c Merge branch 'mg/gpg-interface-using-status' 2013-03-21 14:02:55 -07:00
gpg-interface.h gpg_interface: allow to request status return 2013-02-14 09:30:04 -08:00
graph.c Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
graph.h Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
grep.c fix clang -Wtautological-compare with unsigned enum 2013-02-25 07:35:55 -08:00
grep.h fix clang -Wtautological-compare with unsigned enum 2013-02-25 07:35:55 -08:00
hash.c
hash.h Preallocate hash tables when the number of inserts are known in advance 2013-03-16 22:57:29 -07:00
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Allow building with xmlparse.h 2013-02-11 14:33:04 -08:00
http-walker.c
http.c http_request: reset "type" strbuf before adding 2013-02-06 07:50:56 -08:00
http.h
ident.c
imap-send.c Merge branch 'ob/imap-send-ssl-verify' into maint 2013-03-26 12:41:59 -07:00
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'mg/gpg-interface-using-status' 2013-03-21 14:02:55 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2013-03-17 00:11:11 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c Merge branch 'nd/preallocate-hash' 2013-03-21 14:02:19 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c
notes.h
object.c avoid segfaults on parse_object failure 2013-03-17 12:49:03 -07:00
object.h avoid segfaults on parse_object failure 2013-03-17 12:49:03 -07:00
pack-check.c
pack-refs.c pack-refs: add fully-peeled trait 2013-03-18 08:06:28 -07:00
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c Merge branch 'ef/non-ascii-parse-options-error-diag' into maint 2013-02-27 10:04:26 -08:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'ks/rfc2047-one-char-at-a-time' 2013-03-25 14:00:46 -07:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c use parse_object_or_die instead of die("bad object") 2013-03-17 12:52:14 -07:00
reachable.h
read-cache.c Merge branch 'maint-1.8.1' into maint 2013-03-25 13:46:42 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/reflog-reverse-walk' 2013-03-26 13:15:56 -07:00
refs.h Merge branch 'jc/reflog-reverse-walk' 2013-03-26 13:15:56 -07:00
RelNotes Start preparing for 1.8.2.1 2013-03-25 13:51:13 -07:00
remote-curl.c
remote-testsvn.c
remote.c Merge branch 'jc/push-follow-tag' 2013-03-25 14:00:41 -07:00
remote.h Merge branch 'jc/push-follow-tag' 2013-03-25 14:00:41 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' 2013-03-28 14:38:25 -07:00
revision.h
run-command.c run-command: always set failed_errno in start_command 2013-03-21 14:06:48 -07:00
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c Merge branch 'lf/setup-prefix-pathspec' 2013-03-25 14:01:00 -07:00
sh-i18n--envsubst.c
sha1_file.c count-objects: report garbage files in pack directory too 2013-02-15 08:13:13 -08:00
sha1_name.c Merge branch 'jc/reflog-reverse-walk' 2013-03-26 13:15:56 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c shell: new no-interactive-login command to print a custom message 2013-03-09 23:21:35 -08:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h streaming: void pointer instead of char pointer 2012-05-03 10:22:56 -07:00
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-ctype.c
test-date.c
test-delta.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-dump-cache-tree.c
test-genrandom.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c msvc: test-svn-fe: Fix linker "unresolved external" error 2013-02-25 12:40:34 -08:00
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c Merge branch 'jc/push-follow-tag' 2013-03-25 14:00:41 -07:00
transport.h Merge branch 'jc/push-follow-tag' 2013-03-25 14:00:41 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
upload-pack.c Merge branch 'jk/peel-ref' 2013-03-25 14:01:03 -07:00
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c Merge branch 'jk/utf-8-can-be-spelled-differently' into maint 2013-03-26 12:43:25 -07:00
utf8.h Merge branch 'ks/rfc2047-one-char-at-a-time' 2013-03-25 14:00:46 -07:00
varint.c
varint.h
version.c
version.h
walker.c Change check_ref_format() to take a flags argument 2011-10-05 13:45:29 -07:00
walker.h http: init and cleanup separately from http-walker 2010-03-02 11:10:36 -08:00
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'maint' 2013-03-21 14:06:55 -07:00
wt-status.h Merge branch 'tb/document-status-u-tradeoff' 2013-03-21 14:02:10 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c archive-zip: use deflateInit2() to ask for raw compressed data 2013-03-16 22:07:02 -07:00

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public
License version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.