1
0
mirror of https://github.com/git/git.git synced 2024-10-20 02:58:26 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Pang Yan Han 787570c7cd format-patch: ignore ui.color
commit c9bfb953 (want_color: automatically fallback to color.ui,
2011-08-17) introduced a regression where format-patch produces colorized
patches when color.ui is set to "always".

In f3aafa4 (Disable color detection during format-patch, 2006-07-09),
git_format_config was taught to intercept diff.color to avoid passing it
down to git_log_config and later, git_diff_ui_config.

Teach git_format_config to intercept color.ui in the same way.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Pang Yan Han <pangyanhan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-09-12 11:43:58 -07:00
block-sha1
builtin format-patch: ignore ui.color 2011-09-12 11:43:58 -07:00
compat Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maint 2011-08-01 14:44:13 -07:00
contrib Documentation: use [verse] for SYNOPSIS sections 2011-07-06 14:26:26 -07:00
Documentation Prepare for 1.7.6.1 2011-08-16 12:42:17 -07:00
git_remote_helpers
git-gui
gitk-git
gitweb Merge branch 'jn/mime-type-with-params' into maint 2011-08-16 11:41:26 -07:00
perl
po
ppc
t format-patch: ignore ui.color 2011-09-12 11:43:58 -07:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore Makefile: Track changes to LDFLAGS and relink when necessary 2011-06-22 11:56:53 -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
archive-zip.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
archive.c
archive.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c want_color: automatically fallback to color.ui 2011-08-19 15:51:38 -07:00
color.h want_color: automatically fallback to color.ui 2011-08-19 15:51:38 -07:00
combine-diff.c diff: refactor COLOR_DIFF from a flag into an int 2011-08-18 14:35:53 -07:00
command-list.txt
commit.c
commit.h Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
config.c git-config: Remove extra whitespaces 2011-07-19 13:43:34 -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 connect: correctly number ipv6 network adapter 2011-08-01 10:47:36 -07:00
convert.c
copy.c
COPYING
csum-file.c
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 diff: don't load color config in plumbing 2011-08-19 15:51:38 -07:00
diff.h diff: refactor COLOR_DIFF from a flag into an int 2011-08-18 14:35:53 -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
exec_cmd.c
exec_cmd.h
fast-import.c zlib: zlib can only process 4GB at a time 2011-06-10 11:52:15 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh am: refresh the index at start and --resolved 2011-08-16 11:15:41 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: Export variable `workdir' for --commit-filter 2011-08-08 12:09:38 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: remove extra space from reflog message 2011-08-01 16:05:44 -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 rebase: clarify "restore the original branch" 2011-07-13 22:03:12 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'jl/submodule-update-quiet' into maint 2011-08-16 12:41:14 -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 2011-06-26 12:41:16 -07:00
git-web--browse.sh
git.c Merge branch 'jk/maint-config-alias-fix' into maint 2011-06-01 14:05:22 -07:00
git.spec.in
graph.c color: delay auto-color decision until point of use 2011-08-19 15:51:34 -07:00
graph.h
grep.c color: delay auto-color decision until point of use 2011-08-19 15:51:34 -07:00
grep.h
hash.c
hash.h
help.c help_unknown_cmd: do not propose an "unknown" cmd 2011-07-08 08:59:44 -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 Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
http-walker.c
http.c
http.h Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
ident.c
imap-send.c
INSTALL
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c color: delay auto-color decision until point of use 2011-08-19 15:51:34 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Makefile: Track changes to LDFLAGS and relink when necessary 2011-06-22 11:56:53 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c
merge-recursive.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c
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 setup_pager: set GIT_PAGER_IN_USE 2011-08-18 14:17:12 -07:00
parse-options.c git_config_colorbool: refactor stdout_is_tty handling 2011-08-18 14:48:29 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/maint-1.7.3-checkout-describe' into maint 2011-08-01 14:43:18 -07:00
refs.h Merge branch 'jc/maint-1.7.3-checkout-describe' into maint 2011-08-01 14:43:18 -07:00
RelNotes Prepare for 1.7.6.1 2011-08-16 12:42:17 -07:00
remote-curl.c Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
remote.c
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c
sh-i18n--envsubst.c Merge branch 'ab/i18n-scripts-basic' 2011-06-17 11:40:32 -07:00
sha1_file.c Merge branch 'jc/zlib-wrap' into maint 2011-08-16 11:23:26 -07:00
sha1_name.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
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.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
test-path-utils.c
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.c
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
url.c
url.h
usage.c
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
wt-status.c color: delay auto-color decision until point of use 2011-08-19 15:51:34 -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.