Go to file
Matthieu Moy dea007fb4c diff: parse separate options like -S foo
Change the option parsing logic in revision.c to accept separate forms
like `-S foo' in addition to `-Sfoo'. The rest of git already accepted
this form, but revision.c still used its own option parsing.

Short options affected are -S<string>, -l<num> and -O<orderfile>, for
which an empty string wouldn't make sense, hence -<option> <arg> isn't
ambiguous.

This patch does not handle --stat-name-width and --stat-width, which are
special-cases where diff_long_opt do not apply. They are handled in a
separate patch to ease review.

Original patch by Matthieu Moy, plus refactoring by Jonathan Nieder.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-06 09:14:22 -07:00
Documentation Git 1.7.2 2010-07-21 12:55:50 -07:00
block-sha1 msvc: Select the "fast" definition of the {get,put}_be32() macros 2010-06-27 21:59:32 -07:00
builtin Merge branch 'jl/add-n-ignore-missing' 2010-07-19 11:09:38 -07:00
compat Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
contrib Add a sample user for the svndump library 2010-07-16 13:21:47 -07:00
git-gui
git_remote_helpers Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
gitk-git
gitweb Merge branch 'maint' 2010-07-15 12:04:32 -07:00
perl Git.pm: better error message 2010-06-18 08:49:03 -07:00
ppc
t diff: parse separate options like -S foo 2010-08-06 09:14:22 -07:00
templates
xdiff xdiff: optimise for no whitespace difference when ignoring whitespace. 2010-07-05 23:27:41 -07:00
.gitattributes
.gitignore Merge branch 'sr/remote-helper-export' 2010-05-21 04:02:15 -07:00
.mailmap
COPYING
GIT-VERSION-GEN Git 1.7.2 2010-07-21 12:55:50 -07:00
INSTALL
Makefile Merge branch 'bc/maint-makefile-fixes' 2010-07-15 12:06:11 -07:00
README
RelNotes backmerge a few more fixes to 1.7.1.X series 2010-07-07 11:16:32 -07:00
abspath.c
aclocal.m4 Some platforms lack socklen_t type 2010-05-31 17:36:27 -07:00
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
attr.h enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
command-list.txt
commit.c
commit.h Merge branch 'ar/decorate-color' 2010-06-30 11:55:40 -07:00
config.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
config.mak.in Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
configure.ac Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
connect.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
convert.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
copy.c
csum-file.c
csum-file.h
ctype.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
daemon.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
date.c parse_date: fix signedness in timezone calculation 2010-07-05 11:57:07 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Add optional parameters to the diff option "--ignore-submodules" 2010-06-11 13:33:17 -07:00
diff-no-index.c string_list: Fix argument order for string_list_insert 2010-06-27 10:06:51 -07:00
diff.c diff: parse separate options like -S foo 2010-08-06 09:14:22 -07:00
diff.h diff: parse separate options like -S foo 2010-08-06 09:14:22 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h Make diffcore_std only can run once before a diff_flush 2010-05-07 09:34:28 -07:00
dir.c git add: Add the "--ignore-missing" option for the dry run 2010-07-12 15:13:54 -07:00
dir.h git add: Add the "--ignore-missing" option for the dry run 2010-07-12 15:13:54 -07:00
editor.c
entry.c
environment.c Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
exec_cmd.c Merge branch 'cw/maint-exec-defpath' into maint 2010-06-16 16:33:47 -07:00
exec_cmd.h
fast-import.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
fetch-pack.h
fixup-builtins
fsck.c fsck: fix bogus commit header check 2010-05-28 15:08:27 -07:00
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add-interactive: Clarify “remaining hunks in the file” 2010-06-13 10:05:02 -07:00
git-am.sh Merge branch 'js/maint-am-rebase-invalid-author' into maint 2010-06-28 16:18:43 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'pc/remove-warn' into maint 2010-06-22 08:30:38 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'eb/core-eol' 2010-06-21 06:02:49 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh git-instaweb: Add support for running gitweb via 'plackup' 2010-06-02 11:54:06 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh build: propagate $DIFF to scripts 2010-06-05 09:36:13 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: do nothing on --dry-run 2010-05-25 10:49:54 -07:00
git-quiltimport.sh
git-rebase--interactive.sh rebase-i: do not get fooled by a log message ending with backslash 2010-07-05 23:23:37 -07:00
git-rebase.sh rebase: improve error message when upstream argument is missing 2010-05-31 17:53:23 -07:00
git-relink.perl
git-remote-testgit.py Remove python 2.5'isms 2010-06-13 20:02:50 -07:00
git-repack.sh
git-request-pull.sh git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh 2010-06-02 09:28:12 -07:00
git-send-email.perl Merge branch 'tr/send-email-8bit' into maint 2010-06-28 16:19:03 -07:00
git-sh-setup.sh
git-stash.sh Merge branch 'cb/maint-stash-orphaned-file' 2010-05-21 04:02:23 -07:00
git-submodule.sh git submodule add: Require the new --force option to add ignored paths 2010-07-19 11:10:43 -07:00
git-svn.perl git-svn: write memoized data explicitly to avoid Storable bug 2010-07-19 06:31:04 +00:00
git-web--browse.sh git-web--browse: Add support for google chrome and chromium 2010-05-31 18:03:39 -07:00
git.c Merge branch 'jn/paginate-fix' 2010-07-15 12:09:14 -07:00
git.spec.in git.spec.in: Add gitweb subpackage 2010-06-30 15:49:18 -07:00
graph.c graph.c: register a callback for graph output 2010-05-31 18:02:07 -07:00
graph.h
grep.c grep: support NUL chars in search strings for -F 2010-05-24 11:22:07 -07:00
grep.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
http-fetch.c
http-push.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
http-walker.c Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
http.c Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
http.h Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
ident.c
imap-send.c enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c Rewrite dynamic structure initializations to runtime assignment 2010-05-31 16:59:26 -07:00
ll-merge.h
lockfile.c
log-tree.c Allow customizable commit decorations colors 2010-06-24 12:57:34 -07:00
log-tree.h Allow customizable commit decorations colors 2010-06-24 12:57:34 -07:00
mailmap.c string_list: Fix argument order for string_list_lookup 2010-06-27 10:06:51 -07:00
mailmap.h
match-trees.c
merge-file.c Merge branch 'rs/diff-no-minimal' into maint 2010-06-21 05:38:50 -07:00
merge-recursive.c merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency 2010-07-09 16:28:46 -07:00
merge-recursive.h Merge branch 'gv/portable' 2010-06-21 06:02:44 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
notes.h Merge branch 'maint' 2010-06-25 11:45:27 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h Merge branch 'sp/maint-dumb-http-pack-reidx' into maint 2010-06-16 16:21:30 -07:00
pager.c
parse-options.c parseopt: wrap rev-parse --parseopt usage for eval consumption 2010-06-13 09:38:14 -07:00
parse-options.h Merge branch 'gs/usage-to-stdout' 2010-06-21 06:02:45 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'mg/pretty-magic-space' 2010-06-22 09:45:22 -07:00
progress.c
progress.h
quote.c quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
quote.h quote.c: separate quoting and relative path generation 2010-06-05 09:14:13 -07:00
reachable.c
reachable.h
read-cache.c
reflog-walk.c string_list: Fix argument order for string_list_lookup 2010-06-27 10:06:51 -07:00
reflog-walk.h
refs.c Merge branch 'maint' 2010-07-07 11:18:26 -07:00
refs.h log_ref_setup: don't return stack-allocated array 2010-06-12 09:34:17 -07:00
remote-curl.c Merge branch 'sc/http-late-auth' into maint 2010-06-16 16:32:15 -07:00
remote.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
remote.h enums: omit trailing comma for portability 2010-05-31 16:59:27 -07:00
replace_object.c
rerere.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
rerere.h
resolve-undo.c string_list: Fix argument order for string_list_lookup 2010-06-27 10:06:51 -07:00
resolve-undo.h
revision.c Merge branch 'jp/string-list-api-cleanup' 2010-06-30 11:55:38 -07:00
revision.h Merge branch 'tr/rev-list-count' 2010-06-30 11:55:38 -07:00
run-command.c Merge branch 'js/async-thread' 2010-06-21 06:02:45 -07:00
run-command.h
send-pack.h
server-info.c update-server-info: Shorten read_pack_info_file() 2010-07-19 11:13:52 -07:00
setup.c Merge branch 'maint' 2010-07-20 11:29:30 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/maint-sha1-file-name-fix' into maint 2010-06-21 05:40:41 -07:00
sha1_name.c Merge branch 'cp/textconv-cat-file' 2010-06-27 12:07:55 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c string_list: Fix argument order for string_list_append 2010-06-27 10:06:52 -07:00
string-list.h string_list: Fix argument order for string_list_append 2010-06-27 10:06:52 -07:00
submodule.c Add the option "--ignore-submodules" to "git status" 2010-06-25 11:30:25 -07:00
submodule.h Add the option "--ignore-submodules" to "git status" 2010-06-25 11:30:25 -07:00
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c test-date: fix sscanf type conversion 2010-07-06 08:42:15 -07:00
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-match-trees.c
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used 2010-05-08 22:28:01 -07:00
transport-helper.c string_list: Fix argument order for string_list_append 2010-06-27 10:06:52 -07:00
transport.c make url-related functions reusable 2010-05-24 16:48:32 -07:00
transport.h
tree-diff.c Make git log --follow find copies among unmodified files. 2010-05-07 09:34:29 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint 2010-06-28 16:18:02 -07:00
unpack-trees.h
upload-pack.c
url.c url_decode: URL scheme ends with a colon and does not require a slash 2010-06-24 13:36:30 -07:00
url.h make url-related functions reusable 2010-05-24 16:48:32 -07:00
usage.c
userdiff.c Merge branch 'bs/userdiff-php' 2010-06-13 11:22:05 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Merge branch 'pc/remove-warn' into maint 2010-06-22 08:30:38 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'jl/status-ignore-submodules' 2010-06-30 11:55:39 -07:00
wt-status.h Merge branch 'jl/status-ignore-submodules' 2010-06-30 11:55:39 -07:00
xdiff-interface.c
xdiff-interface.h

README

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

	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.