1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-16 14:04:52 +01:00
Find a file
Thomas Rast ee0d7bf925 Symlink mergetools scriptlets into valgrind wrappers
Since bc7a96a (mergetool--lib: Refactor tools into separate files,
2011-08-18) the mergetools and difftools related tests fail under
--valgrind because the mergetools/* scriptlets are not in the exec
path.

For now, symlink the mergetools subdir into the t/valgrind/bin
directory as a whole, since it does not contain anything of interest
to the valgrind wrappers.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-30 12:27:01 -07:00
block-sha1
builtin Merge branch 'jc/maint-autofix-tag-in-head' 2011-08-25 16:00:37 -07:00
compat Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint 2011-08-01 14:44:13 -07:00
contrib Merge branch 'js/ref-namespaces' 2011-08-17 17:35:38 -07:00
Documentation Merge branch 'di/fast-import-doc' 2011-08-25 16:00:32 -07:00
git-gui
git_remote_helpers transport-helper: update ref status after push with export 2011-07-19 11:17:48 -07:00
gitk-git
gitweb Merge branch 'jn/mime-type-with-params' into maint 2011-08-16 11:41:26 -07:00
mergetools mergetools/meld: Use '--output' when available 2011-08-19 10:52:16 -07:00
perl
po
ppc
t Symlink mergetools scriptlets into valgrind wrappers 2011-08-30 12:27:01 -07:00
templates
vcs-svn
xdiff xdiff/xhistogram: drop need for additional variable 2011-08-08 13:00:17 -07:00
.gitattributes
.gitignore Revert clock-skew based attempt to optimize tag --contains traversal 2011-07-14 11:02:06 -07:00
.mailmap
abspath.c Merge branch 'js/maint-add-path-stat-pwd' into maint 2011-08-16 11:41:27 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c upload-archive: allow user to turn off filters 2011-06-22 11:12:35 -07:00
archive-zip.c Merge branch 'jk/archive-tar-filter' 2011-07-19 09:45:32 -07:00
archive.c Rename git_checkattr() to git_check_attr() 2011-08-04 15:53:21 -07:00
archive.h upload-archive: allow user to turn off filters 2011-06-22 11:12:35 -07:00
attr.c Rename git_checkattr() to git_check_attr() 2011-08-04 15:53:21 -07:00
attr.h Rename git_checkattr() to git_check_attr() 2011-08-04 15:53:21 -07:00
base85.c
bisect.c bisect: introduce support for --no-checkout option. 2011-08-04 15:34:32 -07:00
bisect.h bisect: introduce support for --no-checkout option. 2011-08-04 15:34:32 -07:00
blob.c
blob.h
branch.c
branch.h
builtin.h Revert clock-skew based attempt to optimize tag --contains traversal 2011-07-14 11:02:06 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'cb/maint-ls-files-error-report' 2011-08-23 15:34:31 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'jc/maint-combined-diff-work-tree' into maint 2011-08-23 15:27:30 -07:00
command-list.txt
commit.c whitespace: have SP on both sides of an assignment "=" 2011-08-25 14:47:07 -07:00
commit.h
config.c Merge branch 'jc/pack-order-tweak' 2011-08-05 14:54:57 -07:00
config.mak.in Merge branch 'kk/maint-prefix-in-config-mak' into maint 2011-06-01 14:02:39 -07:00
configure.ac
connect.c Merge branch 'maint' 2011-08-01 14:45:02 -07:00
convert.c Rename git_checkattr() to git_check_attr() 2011-08-04 15:53:21 -07:00
convert.h
copy.c
COPYING
csum-file.c Merge branch 'jc/index-pack' 2011-07-19 09:54:51 -07:00
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jc/maint-reset-unmerged-path' into maint 2011-08-16 11:41:28 -07:00
diff-no-index.c
diff.c Merge branch 'rc/histogram-diff' 2011-08-17 17:36:06 -07:00
diff.h Merge branch 'mg/diff-stat-count' 2011-06-29 17:03:10 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename.c: avoid set-but-not-used warning 2011-06-01 13:54:17 -07:00
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c Merge branch 'js/ref-namespaces' 2011-08-17 17:35:38 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'sr/transport-helper-fix' 2011-08-01 15:00:14 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh misc-sh: fix up whitespace in some other .sh files. 2011-08-05 15:04:48 -07:00
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh Merge branch 'js/i18n-scripts' 2011-08-25 16:00:16 -07:00
git-archimport.perl
git-bisect.sh bisect: add support for bisecting bare repositories 2011-08-09 10:26:18 -07:00
git-compat-util.h Merge branch 'cb/maint-exec-error-report' 2011-08-17 17:25:55 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh difftool--helper: Make style consistent with git 2011-08-19 00:09:17 -07:00
git-difftool.perl
git-filter-branch.sh Merge branch 'js/sh-style' 2011-08-17 17:35:50 -07:00
git-instaweb.sh git-instaweb: Check that correct config file exists for (re)start 2011-06-27 09:11:41 +00:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: Refactor tools into separate files 2011-08-19 00:09:19 -07:00
git-mergetool.sh mergetool: check return value from read 2011-07-01 16:17:29 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'js/i18n-scripts' 2011-08-25 16:00:16 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh rebase -i -p: include non-first-parent commits in todo list 2011-06-19 14:37:23 -07:00
git-rebase--merge.sh
git-rebase.sh misc-sh: fix up whitespace in some other .sh files. 2011-08-05 15:04:48 -07:00
git-relink.perl
git-remote-testgit.py transport-helper: implement marks location as capability 2011-07-19 11:17:48 -07:00
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh gettext: add gettextln, eval_gettextln to encode common idiom 2011-08-08 12:02:16 -07:00
git-sh-setup.sh git-sh-setup: add die_with_status 2011-06-13 11:23:28 -07:00
git-stash.sh stash: take advantage of eval_gettextln 2011-08-08 12:05:22 -07:00
git-submodule.sh Merge branch 'js/i18n-scripts' 2011-08-25 16:00:16 -07:00
git-svn.perl git-svn: Correctly handle root commits in mergeinfo ranges 2011-06-28 03:26:11 +00:00
GIT-VERSION-GEN Git 1.7.6.1 2011-08-24 12:16:58 -07:00
git-web--browse.sh
git.c Merge branch 'js/bisect-no-checkout' 2011-08-17 17:36:09 -07:00
git.spec.in
graph.c
graph.h
grep.c grep: add option to show whole function as context 2011-08-01 16:09:15 -07:00
grep.h grep: add option to show whole function as context 2011-08-01 16:09:15 -07:00
hash.c
hash.h
help.c Merge branch 'ms/help-unknown' 2011-07-22 14:43:21 -07:00
help.h
hex.c
http-backend.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
http-fetch.c
http-push.c whitespace: have SP on both sides of an assignment "=" 2011-08-25 14:47:07 -07:00
http-walker.c
http.c Merge branch 'rc/maint-http-wrong-free' 2011-08-11 11:03:13 -07:00
http.h Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
ident.c
imap-send.c
INSTALL Add explanation of the profile feedback build to the README 2011-06-20 16:31:44 -07:00
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c Rename git_checkattr() to git_check_attr() 2011-08-04 15:53:21 -07:00
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'da/difftool-mergtool-refactor' 2011-08-25 16:00:43 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'jn/plug-empty-tree-leak' 2011-08-25 16:00:29 -07:00
merge-recursive.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c Do not use C++-style comments 2011-08-22 10:07:07 -07:00
notes.h
object.c
object.h
pack-check.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c Reduce parse-options.o dependencies 2011-08-11 12:18:02 -07:00
parse-options.c Reduce parse-options.o dependencies 2011-08-11 12:18:02 -07:00
parse-options.h parse-options: export opterr, optbug 2011-08-11 12:18:02 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
progress.c
progress.h
quote.c ls-files: fix pathspec display on error 2011-08-11 13:04:16 -07:00
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'maint' 2011-08-25 16:00:07 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'js/ref-namespaces' 2011-08-17 17:35:38 -07:00
refs.h Merge branch 'js/ref-namespaces' 2011-08-17 17:35:38 -07:00
RelNotes Prepare for 1.7.6.1 2011-08-16 12:42:17 -07:00
remote-curl.c Merge branch 'cb/maint-quiet-push' into maint 2011-08-23 15:19:45 -07:00
remote.c make copy_ref globally available 2011-06-07 16:07:07 -07:00
remote.h make copy_ref globally available 2011-06-07 16:07:07 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c notice error exit from pager 2011-08-01 16:21:55 -07:00
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'di/parse-options-split' 2011-08-25 16:00:20 -07:00
sh-i18n--envsubst.c Merge branch 'js/i18n-windows' 2011-06-29 17:03:13 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'rt/zlib-smaller-window' 2011-08-23 15:40:33 -07:00
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Merge branch 'jk/maint-config-param' 2011-07-19 09:45:21 -07:00
strbuf.h Merge branch 'jk/maint-config-param' 2011-07-19 09:45:21 -07:00
streaming.c Merge branch 'jc/streaming-filter' 2011-08-01 15:00:29 -07:00
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'jl/maint-fetch-recursive-fix' into maint 2011-08-01 14:44:17 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mktemp.c
test-obj-pool.c
test-parse-options.c parse-options: add OPT_STRING_LIST helper 2011-06-22 11:25:20 -07:00
test-path-utils.c test-path-utils: Add subcommand "prefix_path" 2011-08-04 15:57:18 -07:00
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-pool.c
test-subprocess.c
test-svn-fe.c
test-treap.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c transport-helper: die early on encountering deleted refs 2011-07-19 11:17:48 -07:00
transport.c propagate --quiet to send-pack/receive-pack 2011-07-31 18:45:41 -07:00
transport.h
tree-diff.c Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'jc/diff-index-quick-exit-early' into maint 2011-08-16 11:23:25 -07:00
unpack-trees.h Merge branch 'jc/diff-index-quick-exit-early' into maint 2011-08-16 11:23:25 -07:00
upload-pack.c Sync with 1.7.6.1 2011-08-24 12:18:02 -07:00
url.c
url.h
usage.c error_routine: use parent's stderr if exec fails 2011-07-31 18:27:07 -07:00
userdiff.c Merge branch 'jk/combine-diff-binary-etc' into maint 2011-08-16 11:23:24 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c Rename git_checkattr() to git_check_attr() 2011-08-04 15:53:21 -07:00
wt-status.c Merge branch 'jk/maint-1.7.2-status-ignored' 2011-06-29 17:03:12 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c zlib: allow feeding more than 4GB in one go 2011-06-10 16:17:19 -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.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

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. 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://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.