1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00
Find a file
Junio C Hamano 66006c63e7 git-am: -i does not take a string parameter.
$ git am -3 -s -i file

spewed the usage strings back at the user while

    $ git am -3 -i -s file

didn't.  This fixes it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-08 23:11:10 -08:00
arm
compat Merge branch 'maint' 2007-11-05 22:03:47 -08:00
contrib No longer install git-svnimport, move to contrib/examples 2007-10-30 21:36:29 -07:00
Documentation Add a parseopt mode to git-rev-parse to bring parse-options to shell scripts. 2007-11-05 22:48:13 -08:00
git-gui Merge branch 'maint' of git://repo.or.cz/git-gui into maint 2007-10-20 23:19:22 -04:00
gitweb gitweb: Use config file for repository description and URLs 2007-11-02 18:27:36 -07:00
mozilla-sha1
perl
ppc
t Merge branch 'maint' 2007-11-05 22:03:47 -08:00
templates hooks-pre-commit: use \t, rather than a literal TAB in regexp 2007-10-26 23:16:51 -07:00
xdiff
.gitignore Merge branch 'ph/parseopt' 2007-11-02 16:42:23 -07:00
.mailmap RelNotes-1.5.4: describe recent updates 2007-10-29 13:33:38 -07:00
alloc.c
archive-tar.c
archive-zip.c
archive.h
attr.c Merge branch 'maint' 2007-10-19 01:18:55 -04:00
attr.h
base85.c
blob.c
blob.h
builtin-add.c Merge branch 'ph/parseopt' 2007-11-02 16:42:23 -07:00
builtin-annotate.c
builtin-apply.c Correct some sizeof(size_t) != sizeof(unsigned long) typing errors 2007-10-22 00:00:40 -04:00
builtin-archive.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
builtin-blame.c Merge branch 'maint' 2007-11-03 23:50:54 -07:00
builtin-branch.c Merge branch 'jc/format-patch-encoding' 2007-11-04 01:28:46 -07:00
builtin-bundle.c
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-commit-tree.c
builtin-config.c git-config: print error message if the config file cannot be read 2007-10-18 01:35:33 -04:00
builtin-count-objects.c Make builtin-count-objects.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-describe.c Make builtin-describe.c use parse_options 2007-10-29 21:03:31 -07:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fetch--tool.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
builtin-fetch-pack.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
builtin-fetch.c Merge branch 'np/fetch' 2007-11-04 01:06:48 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c Make builtin-for-each-ref.c use parse-opts. 2007-10-29 21:03:31 -07:00
builtin-fsck.c Fixed a command line option type for builtin-fsck.c 2007-10-30 16:12:18 -07:00
builtin-gc.c gc: --prune prunes unreferenced objects. 2007-11-05 16:39:00 -08:00
builtin-grep.c grep with unmerged index 2007-11-05 18:57:58 -08:00
builtin-http-fetch.c
builtin-init-db.c
builtin-log.c format-patch -s: add MIME encoding header if signer's name requires so 2007-11-01 17:18:39 -07:00
builtin-ls-files.c
builtin-ls-tree.c
builtin-mailinfo.c Make mailsplit and mailinfo strip whitespace from the start of the input 2007-11-02 01:58:40 -07:00
builtin-mailsplit.c Make mailsplit and mailinfo strip whitespace from the start of the input 2007-11-02 01:58:40 -07:00
builtin-merge-base.c
builtin-merge-file.c
builtin-mv.c Make builtin-mv.c use parse-options 2007-10-29 21:03:31 -07:00
builtin-name-rev.c Make builtin-name-rev.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-pack-objects.c Merge branch 'np/pack' 2007-11-04 01:11:17 -07:00
builtin-pack-refs.c Make builtin-pack-refs.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-prune-packed.c return the prune-packed progress display to the inner loop 2007-11-01 15:22:32 -07:00
builtin-prune.c
builtin-push.c Use parseopts in builtin-push 2007-11-05 13:27:35 -08:00
builtin-read-tree.c
builtin-reflog.c
builtin-rerere.c
builtin-reset.c git-reset: do not be confused if there is nothing to reset 2007-11-03 21:44:57 -07:00
builtin-rev-list.c format-patch -s: add MIME encoding header if signer's name requires so 2007-11-01 17:18:39 -07:00
builtin-rev-parse.c git-rev-parse --parseopt 2007-11-06 12:23:14 -08:00
builtin-revert.c Merge branch 'jc/revert-merge' 2007-11-04 01:26:02 -07:00
builtin-rm.c Make builtin-rm.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-runstatus.c
builtin-shortlog.c
builtin-show-branch.c format-patch -s: add MIME encoding header if signer's name requires so 2007-11-01 17:18:39 -07:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c Make builtin-symbolic-ref.c use parse_options. 2007-10-29 21:03:31 -07:00
builtin-tag.c
builtin-tar-tree.c
builtin-unpack-objects.c relax usage of the progress API 2007-10-30 16:08:40 -07:00
builtin-update-index.c
builtin-update-ref.c Make builtin-update-ref.c use parse_options 2007-10-29 21:03:31 -07:00
builtin-upload-archive.c
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h "git" returns 1; "git help" and "git help -a" return 0 2007-10-29 20:51:36 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Change git_connect() to return a struct child_process instead of a pid_t. 2007-10-21 01:30:39 -04:00
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c
commit.c Split off the pretty print stuff into its own file 2007-11-05 11:52:14 -08:00
commit.h format-patch -s: add MIME encoding header if signer's name requires so 2007-11-01 17:18:39 -07:00
config.c
config.mak.in
configure.ac
connect.c Use start_command() in git_connect() instead of explicit fork/exec. 2007-10-21 01:30:39 -04:00
convert.c Use the asyncronous function infrastructure to run the content filter. 2007-10-21 01:30:42 -04:00
copy.c
COPYING
csum-file.c add throughput display to git-push 2007-10-30 16:08:40 -07:00
csum-file.h add throughput display to git-push 2007-10-30 16:08:40 -07:00
ctype.c
daemon.c git-daemon: fix remote port number in log entry 2007-11-05 18:39:18 -08:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
diff.h
diffcore-break.c Fix diffcore-break total breakage 2007-10-21 01:59:42 -04:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Do the fuzzy rename detection limits with the exact renames removed 2007-10-26 23:18:06 -07:00
diffcore.h copy vs rename detection: avoid unnecessary O(n*m) loops 2007-10-26 23:18:06 -07:00
dir.c Speedup scanning for excluded files. 2007-10-29 17:03:11 -07:00
dir.h Speedup scanning for excluded files. 2007-10-29 17:03:11 -07:00
dump-cache-tree.c
entry.c Correct some sizeof(size_t) != sizeof(unsigned long) typing errors 2007-10-22 00:00:40 -04:00
environment.c
exec_cmd.c use only the $PATH for exec'ing git commands 2007-10-29 20:51:37 -07:00
exec_cmd.h use only the $PATH for exec'ing git commands 2007-10-29 20:51:37 -07:00
fast-import.c fast-import.c: fix regression due to strbuf conversion 2007-10-26 15:28:09 -07:00
fetch-pack.h
fixup-builtins
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh git-am: -i does not take a string parameter. 2007-11-08 23:11:10 -08:00
git-archimport.perl
git-bisect.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-checkout.sh Migrate git-checkout.sh to use git-rev-parse --parseopt --keep-dashdash 2007-11-05 22:48:13 -08:00
git-clean.sh Migrate git-clean.sh to use git-rev-parse --parseopt. 2007-11-05 22:48:13 -08:00
git-clone.sh sh-setup: don't let eval output to be shell-expanded. 2007-11-08 01:49:01 -08:00
git-commit.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-compat-util.h revert/cherry-pick: work on merge commits as well 2007-10-26 23:28:28 -07:00
git-cvsexportcommit.perl Merge branch 'bk/maint-cvsexportcommit' 2007-11-01 15:39:59 -07:00
git-cvsimport.perl git-cvsimport: really convert underscores in branch names to dots with -u 2007-11-03 21:31:22 -07:00
git-cvsserver.perl cvsserver: Use exit 1 instead of die when req_Root fails. 2007-10-18 03:02:15 -04:00
git-filter-branch.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-instaweb.sh Migrate git-instaweb.sh to use git-rev-parse --parseopt 2007-11-05 22:48:13 -08:00
git-lost-found.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-ls-remote.sh honor the http.sslVerify option in shell scripts 2007-10-28 14:16:59 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-ours.sh
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh Migrate git-merge.sh to use git-rev-parse --parseopt 2007-11-05 22:48:13 -08:00
git-mergetool.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-parse-remote.sh
git-pull.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-quiltimport.sh Migrate git-quiltimport.sh to use git-rev-parse --parseopt 2007-11-05 22:48:13 -08:00
git-rebase--interactive.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-rebase.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-relink.perl
git-remote.perl Merge branch 'maint' 2007-10-26 23:17:23 -07:00
git-repack.sh Migrate git-repack.sh to use git-rev-parse --parseopt 2007-11-05 22:48:13 -08:00
git-request-pull.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-send-email.perl git-send-email: add a new sendemail.to configuration variable 2007-10-24 20:13:07 -07:00
git-sh-setup.sh sh-setup: don't let eval output to be shell-expanded. 2007-11-08 01:49:01 -08:00
git-stash.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-submodule.sh scripts: Add placeholders for OPTIONS_SPEC 2007-11-06 01:50:02 -08:00
git-svn.perl Merge branch 'maint' 2007-11-05 22:03:47 -08:00
GIT-VERSION-GEN GIT 1.5.3.5 2007-10-31 12:20:05 -07:00
git.c git-rev-parse --parseopt 2007-11-06 12:23:14 -08:00
git.spec.in
gitk gitk: Use the UI font for the diff/old version/new version radio buttons 2007-10-27 21:31:07 +10:00
grep.c
grep.h
hash-object.c
hash.c Do linear-time/space rename logic for exact renames 2007-10-26 23:18:06 -07:00
hash.h Do linear-time/space rename logic for exact renames 2007-10-26 23:18:06 -07:00
help.c include $PATH in generating list of commands for "help -a" 2007-10-29 20:51:37 -07:00
http-push.c errors: "strict subset" -> "ancestor" 2007-11-03 21:29:18 -07:00
http-walker.c
http.c
http.h
ident.c
imap-send.c
index-pack.c Merge branch 'np/pack' 2007-11-04 01:11:17 -07:00
INSTALL
interpolate.c
interpolate.h
list-objects.c
list-objects.h
lockfile.c
log-tree.c format-patch -s: add MIME encoding header if signer's name requires so 2007-11-01 17:18:39 -07:00
log-tree.h rev-list: implement --bisect-all 2007-10-26 23:27:23 -07:00
mailmap.c
mailmap.h
Makefile Split off the pretty print stuff into its own file 2007-11-05 11:52:14 -08:00
match-trees.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
merge-file.c
merge-index.c
merge-recursive.c Make merge-recursive honor diff.renamelimit 2007-10-30 17:27:40 -07:00
merge-tree.c
mktag.c
mktree.c
object-refs.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-write.c Merge branch 'np/progress' 2007-11-02 16:27:37 -07:00
pack.h Merge branch 'np/progress' 2007-11-02 16:27:37 -07:00
pager.c
parse-options.c parse-options: allow callbacks to take no arguments at all. 2007-10-29 21:03:31 -07:00
parse-options.h Some better parse-options documentation. 2007-11-05 18:47:01 -08:00
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path-list.c
path-list.h
path.c
peek-remote.c Change git_connect() to return a struct child_process instead of a pid_t. 2007-10-21 01:30:39 -04:00
pkt-line.c
pkt-line.h
pretty.c Split off the pretty print stuff into its own file 2007-11-05 11:52:14 -08:00
progress.c Show total transferred as part of throughput progress 2007-11-01 15:22:32 -07:00
progress.h add throughput to progress display 2007-10-30 16:08:40 -07:00
quote.c Fix an infinite loop in sq_quote_buf(). 2007-11-04 15:16:59 -08:00
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'maint' 2007-10-18 03:11:17 -04:00
README
receive-pack.c Merge branch 'db/fetch-pack' 2007-10-24 21:59:50 -07:00
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes
remote.c Prevent send-pack from segfaulting (backport from 'master') 2007-10-30 16:21:56 -07:00
remote.h git-fetch: do not fail when remote branch disappears 2007-10-28 14:06:39 -07:00
revision.c
revision.h
run-command.c Add infrastructure to run a function asynchronously. 2007-10-21 01:30:41 -04:00
run-command.h Add infrastructure to run a function asynchronously. 2007-10-21 01:30:41 -04:00
send-pack.c errors: "strict subset" -> "ancestor" 2007-11-03 21:29:18 -07:00
server-info.c
setup.c
sha1_file.c Merge branch 'maint' 2007-10-29 12:53:54 -07:00
sha1_name.c
shallow.c
shell.c shell should call the new setup_path() to setup $PATH 2007-10-29 20:51:37 -07:00
show-index.c Use PRIuMAX instead of 'unsigned long long' in show-index 2007-10-21 02:16:57 -04:00
sideband.c
sideband.h
strbuf.c
strbuf.h Fix comment in strbuf.h to use correct name strbuf_avail() 2007-11-05 21:09:39 -08:00
symlinks.c
tag.c
tag.h
tar.h
test-absolute-path.c
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c Add tests for parse-options.c 2007-10-29 21:03:30 -07:00
test-sha1.c
test-sha1.sh
trace.c
transport.c transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable 2007-11-02 02:05:18 -07:00
transport.h
tree-diff.c Fix diffcore-break total breakage 2007-10-21 01:59:42 -04:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c relax usage of the progress API 2007-10-30 16:08:40 -07:00
unpack-trees.h
update-server-info.c
upload-pack.c upload-pack: Run rev-list in an asynchronous function. 2007-10-21 01:30:42 -04:00
usage.c
utf8.c
utf8.h
var.c
walker.c
walker.h
write_or_die.c
wt-status.c
wt-status.h
xdiff-interface.c
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/tutorial.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.