kernel/git - git - PowerEL Git System

Go to file

Matthieu Moy 5e65ee35dd Move "show_all_errors = 1" to setup_unpack_trees_porcelain() Not only this makes the code clearer since setting up the porcelain error message is meant to work with show_all_errors, but this fixes a call to setup_unpack_trees_porcelain() in git_merge_trees() which did not set show_all_errors. add_rejected_path() used to double-check whether it was running in plumbing mode. This check was ineffective since it was setting show_all_errors too late for traverse_trees() to see it, and is made useless by this patch. Remove it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-09-03 09:31:51 -07:00
Documentation	unpack_trees: group error messages by type	2010-08-11 10:36:06 -07:00
block-sha1	msvc: Select the "fast" definition of the {get,put}_be32() macros	2010-06-27 21:59:32 -07:00
builtin	Move "show_all_errors = 1" to setup_unpack_trees_porcelain()	2010-09-03 09:31:51 -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	Merge git://repo.or.cz/git-gui	2010-02-07 15:52:28 -08:00
git_remote_helpers	Remove python 2.5'isms	2010-06-13 20:02:50 -07:00
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2010-04-18 18:36:41 -07:00
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	t7609: test merge and checkout error messages	2010-08-11 10:36:08 -07:00
templates	Modernize git calling conventions in hook templates	2010-03-20 09:04:38 -07:00
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	Merge branch 'mg/mailmap-update' into maint	2010-04-09 22:22:06 -07:00
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	make_absolute_path(): Do not append redundant slash	2010-02-14 13:21:31 -08:00
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	Merge branch 'cc/maint-bisect-paths' into maint-1.6.6	2010-03-07 14:53:35 -08:00
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint	2010-04-11 13:39:47 -07:00
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	diff: add --word-diff option that generalizes --color-words	2010-04-14 10:56:53 -07:00
color.h	diff: add --word-diff option that generalizes --color-words	2010-04-14 10:56:53 -07:00
combine-diff.c	Merge branch 'rs/diff-no-minimal' into maint	2010-06-21 05:38:50 -07:00
command-list.txt	…
commit.c	make commit_tree a library function	2010-04-01 23:53:54 -07:00
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.c: fix a graph output bug	2010-07-08 18:09:14 -07:00
diff.h	Merge branch 'ab/blame-textconv'	2010-06-27 12:07:44 -07:00
diffcore-break.c	Add a macro DIFF_QUEUE_CLEAR.	2010-05-07 09:34:27 -07:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	Add a macro DIFF_QUEUE_CLEAR.	2010-05-07 09:34:27 -07:00
diffcore-rename.c	Add a macro DIFF_QUEUE_CLEAR.	2010-05-07 09:34:27 -07:00
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	cvsimport: new -R option: generate .git/cvs-revisions mapping	2010-02-06 11:01:59 -08:00
git-cvsserver.perl	Merge branch 'eb/core-eol'	2010-06-21 06:02:49 -07:00
git-difftool--helper.sh	…
git-difftool.perl	difftool: Fix '--gui' when diff.guitool is unconfigured	2010-03-28 09:29:12 -07:00
git-filter-branch.sh	Merge branch 'maint'	2010-02-11 23:06:32 -08:00
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	Merge branch 'gb/maint-submodule-env' into maint	2010-03-08 00:36:02 -08:00
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	Remove hyphen from "git-command" in two error messages	2010-02-15 18:20:54 -08:00
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: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
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	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
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	setup_unpack_trees_porcelain: take the whole options struct as parameter	2010-09-03 09:31:41 -07:00
merge-recursive.h	Move set_porcelain_error_msgs to unpack-trees.c and rename it	2010-09-03 09:31:28 -07:00
name-hash.c	…
notes-cache.c	introduce notes-cache interface	2010-04-01 23:58:30 -07:00
notes-cache.h	introduce notes-cache interface	2010-04-01 23:58:30 -07:00
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	fix "bundle --stdin" segfault	2010-04-19 22:16:35 -07:00
object.h	…
pack-check.c	Extract verify_pack_index for reuse from verify_pack	2010-04-19 17:56:13 -07:00
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	move encode_in_pack_object_header() to a better place	2010-02-23 13:10:56 -08:00
pack.h	Merge branch 'sp/maint-dumb-http-pack-reidx' into maint	2010-06-16 16:21:30 -07:00
pager.c	Make 'git var GIT_PAGER' always print the configured pager	2010-02-14 18:23:17 -08:00
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	Merge branch 'mm/mkstemps-mode-for-packfiles' into maint	2010-03-08 00:36:00 -08:00
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	Enable threaded async procedures whenever pthreads is available	2010-03-10 14:26:54 -08:00
send-pack.h	git-push: make git push --porcelain print "Done"	2010-02-28 10:39:30 -08:00
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	pretty: Respect --abbrev option	2010-05-04 15:38:58 -07:00
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.c: Parse tagger date (if present)	2010-04-12 21:45:17 -07:00
tag.h	tag.c: Parse tagger date (if present)	2010-04-12 21:45:17 -07:00
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-safe xmalloc and xrealloc needs a recursive mutex	2010-04-08 23:06:39 -07:00
thread-utils.h	Thread-safe xmalloc and xrealloc needs a recursive mutex	2010-04-08 23:06:39 -07:00
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	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
tree-diff.c	Make git log --follow find copies among unmodified files.	2010-05-07 09:34:29 -07:00
tree-walk.c	unpack_trees: group error messages by type	2010-08-11 10:36:06 -07:00
tree-walk.h	unpack_trees: group error messages by type	2010-08-11 10:36:06 -07:00
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-trees.c	Move "show_all_errors = 1" to setup_unpack_trees_porcelain()	2010-09-03 09:31:51 -07:00
unpack-trees.h	Move "show_all_errors = 1" to setup_unpack_trees_porcelain()	2010-09-03 09:31:51 -07:00
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	Make report() from usage.c public as vreportf() and use it.	2010-03-07 00:37:35 -08:00
userdiff.c	Merge branch 'bs/userdiff-php'	2010-06-13 11:22:05 -07:00
userdiff.h	diff: cache textconv output	2010-04-02 00:05:31 -07:00
utf8.c	Merge branch 'rs/optim-text-wrap' into maint	2010-03-04 22:26:33 -08:00
utf8.h	Merge branch 'rs/optim-text-wrap' into maint	2010-03-04 22:26:33 -08:00
walker.c	…
walker.h	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
wrap-for-bin.sh	wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR	2010-03-02 16:27:03 -08:00
wrapper.c	Merge branch 'pc/remove-warn' into maint	2010-06-22 08:30:38 -07:00
write_or_die.c	…
ws.c	whitespace: add tab-in-indent support for --whitespace=fix	2010-04-04 14:21:54 -07:00
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	Merge branch 'maint-1.7.0' into maint	2010-05-04 15:20:47 -07:00
xdiff-interface.h	Merge branch 'maint-1.7.0' into maint	2010-05-04 15:20:47 -07:00

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.