Find a file
Jay Soffian 98ef23b3b1 git-am: minor cleanups
Update usage statement to remove a no-longer supported option, and to hide two
options (one a no-op, one internal) unless --help-all is used.

Use "test -t 0" instead of "tty -s" to detect when stdin is a terminal. (test
-t 0 is used elsewhere in git-am and in other git shell scripts, tty -s is
not, and appears to be deprecated by POSIX)

Use "test ..." instead of "[ ... ]" and "die <msg>" instead of "echo <msg>
>&2; exit 1" to be consistent with rest of script.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-28 10:53:34 -08:00
arm
compat Merge branch 'js/mingw-rename-fix' 2008-11-27 19:25:06 -08:00
contrib Merge branch 'js/patience-diff' 2009-01-23 21:51:38 -08:00
Documentation Mention "local convention" rule in the CodingGuidelines 2009-01-26 00:35:58 -08:00
git-gui Merge git://repo.or.cz/git-gui 2008-12-17 21:56:48 -08:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-12-21 18:31:12 -08:00
gitweb Merge branch 'gb/gitweb-opml' 2009-01-17 23:07:19 -08:00
mozilla-sha1
perl Merge branch 'pb/maint-git-pm-false-dir' into maint 2009-01-23 19:02:41 -08:00
ppc
t Windows: Fix intermittent failures of t7701 2009-01-28 10:31:04 -08:00
templates
xdiff Merge branch 'js/patience-diff' 2009-01-23 21:51:38 -08:00
.gitattributes
.gitignore Ignore test-ctype 2009-01-25 11:25:14 -08:00
.mailmap
abspath.c make_absolute_path(): check bounds when seeing an overlong symlink 2008-12-17 13:36:34 -08:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
branch.c
branch.h
builtin-add.c git add: do not add files from a submodule 2009-01-05 10:48:32 -08:00
builtin-annotate.c
builtin-apply.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
builtin-archive.c
builtin-blame.c builtin-blame.c: use strbuf_readlink() 2008-12-17 13:36:35 -08:00
builtin-branch.c git-branch: display sha1 on branch deletion 2008-12-12 20:42:59 -08:00
builtin-bundle.c
builtin-cat-file.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-check-attr.c Fix non-literal format in printf-style calls 2008-11-11 14:50:02 -08:00
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c Merge branch 'cb/add-pathspec' 2009-01-25 17:13:11 -08:00
builtin-clean.c
builtin-clone.c Allow cloning an empty repository 2009-01-23 00:19:49 -08:00
builtin-commit-tree.c
builtin-commit.c Merge branch 'cb/add-pathspec' 2009-01-25 17:13:11 -08:00
builtin-config.c
builtin-count-objects.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
builtin-describe.c Merge branch 'sp/maint-describe-all-tag-warning' into maint 2008-12-27 14:21:15 -08:00
builtin-diff-files.c Add cache preload facility 2008-11-14 19:11:49 -08:00
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c reorder ALLOW_TEXTCONV option setting 2008-12-07 19:59:25 -08:00
builtin-fast-export.c fast-export: print usage when no options specified 2009-01-03 14:24:15 -08:00
builtin-fetch--tool.c
builtin-fetch-pack.c Merge branch 'maint' 2008-12-07 15:13:02 -08:00
builtin-fetch.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c Merge branch 'ap/clone-into-empty' 2009-01-17 23:05:54 -08:00
builtin-gc.c Move run_hook() from builtin-commit.c into run-command.c (libgit) 2009-01-17 17:16:24 -08:00
builtin-grep.c grep: grep cache entries if they are "assume unchanged" 2008-12-27 14:30:46 -08:00
builtin-help.c
builtin-http-fetch.c
builtin-init-db.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-log.c Merge branch 'jc/maint-format-patch' into maint 2009-01-23 18:59:59 -08:00
builtin-ls-files.c remove pathspec_match, use match_pathspec instead 2009-01-14 19:18:44 -08:00
builtin-ls-remote.c git ls-remote: make usage string match manpage 2008-11-11 13:24:00 -08:00
builtin-ls-tree.c Document git-ls-tree --full-tree 2009-01-01 04:43:23 -08:00
builtin-mailinfo.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c merge-file: handle freopen() failure 2008-12-26 19:10:02 -08:00
builtin-merge-ours.c
builtin-merge-recursive.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-merge.c Move run_hook() from builtin-commit.c into run-command.c (libgit) 2009-01-17 17:16:24 -08:00
builtin-mv.c fix handling of multiple untracked files for git mv -k 2009-01-14 09:34:22 -08:00
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
builtin-push.c
builtin-read-tree.c checkout: Fix "initial checkout" detection 2008-11-12 14:16:50 -08:00
builtin-receive-pack.c Move run_hook() from builtin-commit.c into run-command.c (libgit) 2009-01-17 17:16:24 -08:00
builtin-reflog.c
builtin-remote.c git-remote: add verbose mode to git remote update 2008-11-18 15:38:34 -08:00
builtin-rerere.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
builtin-reset.c Add 'merge' mode to 'git reset' 2008-12-02 15:15:58 -08:00
builtin-rev-list.c Add a 'source' decorator for commits 2008-11-04 00:08:03 -08:00
builtin-rev-parse.c
builtin-revert.c git-revert: record the parent against which a revert was made 2008-12-21 18:32:04 -08:00
builtin-rm.c git add --intent-to-add: fix removal of cached emptiness 2008-11-28 19:58:24 -08:00
builtin-send-pack.c send-pack: do not send unknown object name from ".have" to pack-objects 2009-01-27 23:46:59 -08:00
builtin-shortlog.c Merge branch 'rs/maint-shortlog-foldline' 2009-01-17 23:05:23 -08:00
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c Merge branch 'maint' 2008-12-07 15:13:02 -08:00
builtin-tar-tree.c
builtin-unpack-objects.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
builtin-update-index.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
builtin-update-ref.c
builtin-upload-archive.c
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c git add --intent-to-add: do not let an empty blob be committed by accident 2008-11-30 17:59:19 -08:00
builtin.h
bundle.c Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
bundle.h
cache-tree.c git add --intent-to-add: do not let an empty blob be committed by accident 2008-11-30 17:59:19 -08:00
cache-tree.h
cache.h Merge branch 'kb/lstat-cache' 2009-01-25 17:13:34 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c Merge branch 'js/diff-color-words' 2009-01-25 17:13:29 -08:00
color.h Merge branch 'js/diff-color-words' 2009-01-25 17:13:29 -08:00
combine-diff.c combine-diff.c: use strbuf_readlink() 2008-12-17 13:36:35 -08:00
command-list.txt
commit.c
commit.h
config.c Get rid of the last remnants of GIT_CONFIG_LOCAL 2008-12-14 16:43:39 -08:00
config.mak.in autoconf: Enable threaded delta search when pthreads are supported 2008-12-02 22:48:58 -08:00
configure.ac Fix naming scheme for configure cache variables. 2009-01-21 00:12:25 -08:00
connect.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
daemon.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
date.c date/time: do not get confused by fractional seconds 2008-11-13 09:06:58 -08:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Cleanup of unused symcache variable inside diff-lib.c 2009-01-11 15:56:55 -08:00
diff-no-index.c diff --no-index -q: fix endless loop 2009-01-07 12:04:38 -08:00
diff.c Merge branch 'js/diff-color-words' 2009-01-25 17:13:29 -08:00
diff.h color-words: take an optional regular expression describing words 2009-01-17 10:43:08 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Rename detection: Avoid repeated filespec population 2009-01-21 00:14:12 -08:00
diffcore.h Merge branch 'maint' 2008-11-02 16:36:40 -08:00
dir.c Merge branch 'cb/add-pathspec' 2009-01-25 17:13:11 -08:00
dir.h Allow cloning to an existing empty directory 2009-01-11 13:26:29 -08:00
dump-cache-tree.c
editor.c
entry.c Merge branch 'kb/lstat-cache' 2009-01-25 17:13:34 -08:00
environment.c Add cache preload facility 2008-11-14 19:11:49 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'maint-1.6.0' into maint 2009-01-13 23:10:50 -08:00
fetch-pack.h
fixup-builtins
fsck.c Merge branch 'maint' 2008-11-11 14:49:50 -08:00
fsck.h
generate-cmdlist.sh generate-cmdlist.sh: avoid selecting synopsis at wrong place 2008-11-30 18:16:32 -08:00
git-add--interactive.perl Add 'g' command to go to a hunk 2008-12-04 17:59:45 -08:00
git-am.sh git-am: minor cleanups 2009-01-28 10:53:34 -08:00
git-archimport.perl
git-bisect.sh bisect view: call gitk if Cygwin's SESSIONNAME variable is set 2009-01-03 14:25:27 -08:00
git-compat-util.h Add is_regex_special() 2009-01-17 18:30:41 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl cvsserver: change generation of CVS author names 2009-01-05 11:30:06 -08:00
git-filter-branch.sh filter-branch: add git_commit_non_empty_tree and --prune-empty. 2009-01-10 17:35:58 -08:00
git-instaweb.sh
git-lost-found.sh lost-found: use git rev-parse -q 2008-12-03 14:27:17 -08:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh mergetool: put the cursor on the editable file for Vim 2009-01-18 12:29:32 -08:00
git-parse-remote.sh
git-pull.sh pull: use git rev-parse -q 2008-12-03 14:27:17 -08:00
git-quiltimport.sh
git-rebase--interactive.sh rebase -i: correctly remember --root flag across --continue 2009-01-26 21:23:19 -08:00
git-rebase.sh rebase: learn to rebase root commit 2009-01-11 23:03:36 -08:00
git-relink.perl
git-repack.sh repack: only unpack-unreachable if we are deleting redundant packs 2008-11-14 21:39:10 -08:00
git-request-pull.sh request-pull: make usage string match manpage 2008-11-17 02:27:18 -08:00
git-send-email.perl send-email: futureproof split_addrs() sub 2008-12-21 01:57:59 -08:00
git-sh-setup.sh git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X 2009-01-05 11:46:58 -08:00
git-stash.sh Revert "git-stash: use git rev-parse -q" 2008-12-07 17:30:35 -08:00
git-submodule.sh submodule: use git rev-parse -q 2008-12-03 14:27:18 -08:00
git-svn.perl git-svn: add --ignore-paths option for fetching 2009-01-25 17:01:47 -08:00
GIT-VERSION-GEN Sync with 1.6.1.1 2009-01-25 17:09:35 -08:00
git-web--browse.sh
git.c Merge branch 'as/autocorrect-alias' 2009-01-17 23:05:34 -08:00
git.spec.in Include git-gui--askpass in git-gui RPM package 2008-12-01 00:54:16 -08:00
graph.c
graph.h
grep.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
grep.h grep: don't call regexec() for fixed strings 2009-01-09 21:35:56 -08:00
hash-object.c Fix non-literal format in printf-style calls 2008-11-11 14:50:02 -08:00
hash.c
hash.h
help.c
help.h
http-push.c http-push.c: style fixes 2009-01-25 11:25:13 -08:00
http-walker.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
http.c Merge branch 'maint' 2008-12-07 15:13:02 -08:00
http.h
ident.c Add backslash to list of 'crud' characters in real name 2008-12-02 15:29:13 -08:00
imap-send.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
index-pack.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
INSTALL Add support for a pdf version of the user manual 2008-12-10 19:17:43 -08:00
levenshtein.c Document levenshtein.c 2008-11-23 19:23:34 -08:00
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c merge-recursive: use strbuf_expand() instead of interpolate() 2008-11-23 19:55:52 -08:00
ll-merge.h
lockfile.c Make sure lockfiles are unlocked when dying on SIGPIPE 2008-12-21 01:56:20 -08:00
log-tree.c Fix machine-parseability of 'git log --source' 2008-11-16 00:24:41 -08:00
log-tree.h Add a 'source' decorator for commits 2008-11-04 00:08:03 -08:00
mailmap.c
mailmap.h
Makefile make: Remove -pthread on Darwin (it is included by cstdlib). 2009-01-26 15:11:37 -08:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint 2009-01-13 01:15:19 -08:00
merge-recursive.h
merge-tree.c
mktag.c
mktree.c
name-hash.c
object.c bundle: allow the same ref to be given more than once 2009-01-17 23:00:31 -08:00
object.h Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
pack-check.c
pack-redundant.c remove trailing LF in die() messages 2009-01-05 13:01:01 -08:00
pack-refs.c
pack-refs.h
pack-revindex.c make find_pack_revindex() aware of the nasty world 2008-11-02 15:22:35 -08:00
pack-revindex.h
pack-write.c
pack.h
pager.c Merge branch 'maint' 2008-12-15 23:06:13 -08:00
parse-options.c Teach/Fix pull/fetch -q/-v options 2008-11-14 17:18:32 -08:00
parse-options.h Teach/Fix pull/fetch -q/-v options 2008-11-14 17:18:32 -08:00
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c Fix non-literal format in printf-style calls 2008-11-11 14:43:59 -08:00
pkt-line.c
pkt-line.h
preload-index.c Makefile: introduce NO_PTHREADS 2008-12-02 15:29:12 -08:00
pretty.c Merge branch 'jk/color-parse' 2009-01-21 16:50:34 -08:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Make 'ce_compare_link()' use the new 'strbuf_readlink()' 2008-12-17 13:36:34 -08:00
README README: tutorial.txt is now called gittutorial.txt 2009-01-06 22:12:07 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'maint' 2008-11-11 14:49:50 -08:00
refs.h
RelNotes Prepare for v1.6.1.1 maintenance release 2008-12-29 01:17:34 -08:00
remote.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
remote.h remote: add a new 'origin' variable to the struct 2008-11-11 14:19:29 -08:00
rerere.c Make some of fwrite/fclose/write/close failures visible 2008-12-04 18:05:41 -08:00
rerere.h
revision.c Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
revision.h revision traversal: '--simplify-by-decoration' 2008-11-04 00:45:34 -08:00
run-command.c run_hook(): allow more than 9 hook arguments 2009-01-17 17:57:15 -08:00
run-command.h Move run_hook() from builtin-commit.c into run-command.c (libgit) 2009-01-17 17:16:24 -08:00
send-pack.h
server-info.c
setup.c Merge branch 'sg/maint-gitdir-in-subdir' 2009-01-21 16:51:25 -08:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
sha1_name.c Merge branch 'maint-1.6.0' into maint 2009-01-27 15:23:46 -08:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
strbuf.c strbuf: instate cleanup rule in case of non-memory errors 2009-01-06 22:13:43 -08:00
strbuf.h Add generic 'strbuf_readlink()' helper function 2008-12-17 13:36:30 -08:00
string-list.c
string-list.h
symlinks.c lstat_cache(): introduce clear_lstat_cache() function 2009-01-18 13:58:34 -08:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-path-utils.c test-path-utils: Fix off by one, found by valgrind 2009-01-27 15:16:41 -08:00
test-sha1.c
test-sha1.sh
thread-utils.c
thread-utils.h
trace.c
transport.c add is_dot_or_dotdot inline function 2009-01-11 13:21:57 -08:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c Merge branch 'kb/lstat-cache' 2009-01-25 17:13:34 -08:00
unpack-trees.h
update-server-info.c
upload-pack.c
usage.c
userdiff.c Change the spelling of "wordregex". 2009-01-21 23:52:16 -08:00
userdiff.h color-words: make regex configurable via attributes 2009-01-17 10:44:21 -08:00
utf8.c
utf8.h
var.c
walker.c
walker.h
wrapper.c Wrap inflate and other zlib routines for better error reporting 2009-01-11 02:13:06 -08:00
write_or_die.c
ws.c
wt-status.c reorder ALLOW_TEXTCONV option setting 2008-12-07 19:59:25 -08:00
wt-status.h
xdiff-interface.c xdiff-interface.c: remove 10 duplicated lines 2008-11-26 10:47:41 -08:00
xdiff-interface.h

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

	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 "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

Many Git online resources are accessible from http://git.or.cz/
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.