kernel/git - git - PowerEL Git System

Giuseppe Bilotta 86c91f9179 git apply: option to ignore whitespace differences Introduce --ignore-whitespace option and corresponding config bool to ignore whitespace differences while applying patches, akin to the 'patch' program. 'git am', 'git rebase' and the bash git completion are made aware of this option. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		16 years ago
Documentation	git apply: option to ignore whitespace differences	16 years ago
arm	…
compat	MinGW: truncate exit()'s argument to lowest 8 bits	16 years ago
contrib	git apply: option to ignore whitespace differences	16 years ago
git-gui	Merge git://repo.or.cz/git-gui	16 years ago
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	16 years ago
gitweb	gitweb: update Git homepage URL	16 years ago
mozilla-sha1	…
perl	Git.pm: Always set Repository to absolute path if autodetecting	16 years ago
ppc	…
t	git apply: option to ignore whitespace differences	16 years ago
templates	Merge branch 'hv/sample-update'	16 years ago
xdiff	refactor: use bitsizeof() instead of 8 * sizeof()	16 years ago
.gitattributes	.gitattributes: CR at the end of the line is an error	16 years ago
.gitignore	…
.mailmap	…
COPYING	…
GIT-VERSION-GEN	Start 1.6.5 cycle	16 years ago
INSTALL	…
Makefile	Merge branch 'maint'	16 years ago
README	…
RelNotes	Start 1.6.5 cycle	16 years ago
abspath.c	Use die_errno() instead of die() when checking syscalls	16 years ago
alias.c	Merge branch 'jk/maint-1.6.0-trace-argv' into maint	16 years ago
alloc.c	Fix a bunch of pointer declarations (codestyle)	16 years ago
archive-tar.c	archive-tar.c: squelch a type mismatch warning	16 years ago
archive-zip.c	…
archive.c	parse-opts: prepare for OPT_FILENAME	16 years ago
archive.h	…
attr.c	attr: plug minor memory leak	16 years ago
attr.h	…
base85.c	Fix big left-shifts of unsigned char	16 years ago
bisect.c	Merge branch 'tr/die_errno'	16 years ago
bisect.h	bisect: add parameters to "filter_skipped"	16 years ago
blob.c	…
blob.h	…
branch.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
branch.h	…
builtin-add.c	Add 'fill_directory()' helper function for directory traversal	16 years ago
builtin-annotate.c	…
builtin-apply.c	git apply: option to ignore whitespace differences	16 years ago
builtin-archive.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-bisect--helper.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-blame.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-branch.c	Merge branch 'maint'	16 years ago
builtin-bundle.c	…
builtin-cat-file.c	Merge branch 'sb/opt-filename'	16 years ago
builtin-check-attr.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-check-ref-format.c	…
builtin-checkout-index.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-checkout.c	Merge branch 'lt/maint-diff-reduce-lstat' into maint	16 years ago
builtin-clean.c	Add 'fill_directory()' helper function for directory traversal	16 years ago
builtin-clone.c	Merge branch 'tr/die_errno'	16 years ago
builtin-commit-tree.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
builtin-commit.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-config.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
builtin-count-objects.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-describe.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-diff-files.c	…
builtin-diff-index.c	…
builtin-diff-tree.c	…
builtin-diff.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
builtin-fast-export.c	git fast-export: add --no-data option	16 years ago
builtin-fetch--tool.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
builtin-fetch-pack.c	fetch-pack: close output channel after sideband demultiplexer terminates	16 years ago
builtin-fetch.c	quickfetch(): Prevent overflow of the rev-list command line	16 years ago
builtin-fmt-merge-msg.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-for-each-ref.c	Merge branch 'ak/maint-for-each-ref-no-lookup'	16 years ago
builtin-fsck.c	Merge branch 'tr/die_errno'	16 years ago
builtin-gc.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-grep.c	Merge branch 'rs/grep-p'	16 years ago
builtin-help.c	Fix various sparse warnings in the git source code	16 years ago
builtin-http-fetch.c	…
builtin-init-db.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-log.c	Merge branch 'tr/die_errno'	16 years ago
builtin-ls-files.c	Add 'fill_directory()' helper function for directory traversal	16 years ago
builtin-ls-remote.c	…
builtin-ls-tree.c	…
builtin-mailinfo.c	Revert "mailinfo: Remove only one set of square brackets"	16 years ago
builtin-mailsplit.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-merge-base.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-merge-file.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-merge-ours.c	…
builtin-merge-recursive.c	MinGW: Fix compiler warning in merge-recursive	16 years ago
builtin-merge.c	Merge branch 'tr/die_errno'	16 years ago
builtin-mktree.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-mv.c	Merge branch 'tr/die_errno'	16 years ago
builtin-name-rev.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-pack-objects.c	Merge branch 'js/maint-graft-unhide-true-parents'	16 years ago
builtin-pack-refs.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-prune-packed.c	replace direct calls to unlink(2) with unlink_or_warn	16 years ago
builtin-prune.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-push.c	push: do not give big warning when no preference is configured	16 years ago
builtin-read-tree.c	…
builtin-receive-pack.c	receive-pack: do not send error details to the client	16 years ago
builtin-reflog.c	…
builtin-remote.c	Merge branch 'cf/maint-remote-uploadpack-useconfig-fix'	16 years ago
builtin-rerere.c	replace direct calls to unlink(2) with unlink_or_warn	16 years ago
builtin-reset.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-rev-list.c	bisect: add parameters to "filter_skipped"	16 years ago
builtin-rev-parse.c	Merge branch 'tr/die_errno'	16 years ago
builtin-revert.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-rm.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
builtin-send-pack.c	Merge branch 'tr/die_errno'	16 years ago
builtin-shortlog.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-show-branch.c	show-branch: don't use LASTARG_DEFAULT with OPTARG	16 years ago
builtin-show-ref.c	show-ref: migrate to parse-options	16 years ago
builtin-stripspace.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-symbolic-ref.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-tag.c	Merge branch 'tr/die_errno'	16 years ago
builtin-tar-tree.c	Use die_errno() instead of die() when checking syscalls	16 years ago
builtin-unpack-objects.c	Merge branch 'tr/die_errno'	16 years ago
builtin-update-index.c	Fix a bunch of pointer declarations (codestyle)	16 years ago
builtin-update-ref.c	parse-opts: prepare for OPT_FILENAME	16 years ago
builtin-upload-archive.c	Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint	16 years ago
builtin-verify-pack.c	…
builtin-verify-tag.c	replace direct calls to unlink(2) with unlink_or_warn	16 years ago
builtin-write-tree.c	write-tree --ignore-cache-tree	16 years ago
builtin.h	build-in git-mktree	16 years ago
bundle.c	Terminate argv with NULL before calling setup_revisions()	16 years ago
bundle.h	…
cache-tree.c	Improve on the 'invalid object' error message at commit time	16 years ago
cache-tree.h	Optimize "diff-index --cached" using cache-tree	16 years ago
cache.h	git apply: option to ignore whitespace differences	16 years ago
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
combine-diff.c	Merge branch 'maint'	16 years ago
command-list.txt	…
commit.c	Merge branch 'js/maint-graft-unhide-true-parents'	16 years ago
commit.h	bisect: drop unparse_commit() and use clear_commit_marks()	16 years ago
config.c	After renaming a section, print any trailing variable definitions	16 years ago
config.mak.in	configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests	16 years ago
configure.ac	configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing	16 years ago
connect.c	Fix various sparse warnings in the git source code	16 years ago
convert.c	…
copy.c	…
csum-file.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
csum-file.h	…
ctype.c	ctype.c: fix typo in comment	16 years ago
daemon.c	Merge branch 'tr/die_errno'	16 years ago
date.c	Work around BSD whose typeof(tv.tv_sec) != time_t	16 years ago
decorate.c	Unify signedness in hashing calls	16 years ago
decorate.h	…
delta.h	Fix big left-shifts of unsigned char	16 years ago
diff-delta.c	…
diff-lib.c	Merge branch 'jc/cache-tree'	16 years ago
diff-no-index.c	Fix a bunch of pointer declarations (codestyle)	16 years ago
diff.c	Merge branch 'rs/grep-p'	16 years ago
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	Avoid using 'lstat()' to figure out directories	16 years ago
dir.h	Simplify read_directory[_recursive]() arguments	16 years ago
editor.c	…
entry.c	Use die_errno() instead of die() when checking syscalls	16 years ago
environment.c	git apply: option to ignore whitespace differences	16 years ago
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Use die_errno() instead of die() when checking syscalls	16 years ago
fetch-pack.h	…
fixup-builtins	…
fsck.c	Allow the Unix epoch to be a valid commit date	16 years ago
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	add -i: do not dump patch during application	16 years ago
git-am.sh	git apply: option to ignore whitespace differences	16 years ago
git-archimport.perl	…
git-bisect.sh	bisect: make "git bisect" use new "--next-all" bisect-helper function	16 years ago
git-compat-util.h	janitor: add DIV_ROUND_UP and use it.	16 years ago
git-cvsexportcommit.perl	Avoid generating a warning if $fullname{$file} is undefined	16 years ago
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	…
git-instaweb.sh	Trivial path quoting fixes in git-instaweb	16 years ago
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	Clarify kind of conflict in merge-one-file helper	16 years ago
git-merge-resolve.sh	…
git-mergetool--lib.sh	mergetool--lib: add support for araxis merge	16 years ago
git-mergetool.sh	…
git-parse-remote.sh	parse-remote: remove unused functions	16 years ago
git-pull.sh	Merge branch 'sb/pull-rebase'	16 years ago
git-quiltimport.sh	…
git-rebase--interactive.sh	Fix rebase -p --onto	16 years ago
git-rebase.sh	git apply: option to ignore whitespace differences	16 years ago
git-relink.perl	…
git-repack.sh	Merge branch 'js/maint-graft-unhide-true-parents'	16 years ago
git-request-pull.sh	request-pull: optionally show a patch as well	16 years ago
git-send-email.perl	Merge branch 'jk/maint-send-email-alias-loop'	16 years ago
git-sh-setup.sh	git-sh-setup: introduce say() for quiet options	16 years ago
git-stash.sh	git stash: modernize use of "dashed" git-XXX calls	16 years ago
git-submodule.sh	Merge branch 'sb/quiet-porcelains'	16 years ago
git-svn.perl	git svn: make minimize URL more reliable over http(s)	16 years ago
git-web--browse.sh	git: browsing paths with spaces when using the start command	16 years ago
git.c	Merge branch 'js/run-command-updates' (early part)	16 years ago
git.spec.in	…
graph.c	janitor: use NULL and not 0 for pointers.	16 years ago
graph.h	…
grep.c	grep: simplify -p output	16 years ago
grep.h	grep -p: support user defined regular expressions	16 years ago
hash-object.c	Use die_errno() instead of die() when checking syscalls	16 years ago
hash.c	…
hash.h	…
help.c	janitor: add DIV_ROUND_UP and use it.	16 years ago
help.h	…
http-push.c	http-push: fix xml_entities() string parsing overrun	16 years ago
http-walker.c	Merge branch 'rc/maint-http-local-slot-fix' into maint	16 years ago
http.c	Merge branch 'ml/http'	16 years ago
http.h	http*: add helper methods for fetching objects (loose)	16 years ago
ident.c	…
imap-send.c	Fix various sparse warnings in the git source code	16 years ago
index-pack.c	Merge branch 'tr/die_errno'	16 years ago
levenshtein.c	…
levenshtein.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	Merge branch 'tr/die_errno'	16 years ago
ll-merge.h	…
lockfile.c	Merge branch 'ar/unlink-err' into maint	16 years ago
log-tree.c	log-tree: fix confusing comment	16 years ago
log-tree.h	…
mailmap.c	Fix various sparse warnings in the git source code	16 years ago
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-index.c	Simplify some instances of run_command() by using run_command_v_opt().	16 years ago
merge-recursive.c	Merge branch 'tr/die_errno'	16 years ago
merge-recursive.h	…
merge-tree.c	…
mktag.c	Use die_errno() instead of die() when checking syscalls	16 years ago
name-hash.c	…
object.c	Unify signedness in hashing calls	16 years ago
object.h	…
pack-check.c	Don't expect verify_pack() callers to set pack_size	16 years ago
pack-redundant.c	…
pack-refs.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
pack-refs.h	…
pack-revindex.c	janitor: useless checks before free	16 years ago
pack-revindex.h	…
pack-write.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
pack.h	…
pager.c	…
parse-options.c	parse-opt: optionally show "--no-" option string	16 years ago
parse-options.h	parse-opt: optionally show "--no-" option string	16 years ago
patch-delta.c	Fix big left-shifts of unsigned char	16 years ago
patch-id.c	…
patch-ids.c	…
patch-ids.h	…
path.c	diff: generate pretty filenames in prep_temp_blob()	16 years ago
pkt-line.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
pkt-line.h	…
preload-index.c	janitor: add DIV_ROUND_UP and use it.	16 years ago
pretty.c	Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility	16 years ago
progress.c	…
progress.h	…
quote.c	Fix various sparse warnings in the git source code	16 years ago
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Use die_errno() instead of die() when checking syscalls	16 years ago
reflog-walk.c	Fix a bunch of pointer declarations (codestyle)	16 years ago
reflog-walk.h	…
refs.c	Merge branch 'maint'	16 years ago
refs.h	Change prettify_ref to prettify_refname	16 years ago
remote.c	Merge branch 'cb/maint-fetch-refspec-wo-dst'	16 years ago
remote.h	Merge branch 'mg/pushurl'	16 years ago
rerere.c	replace direct calls to unlink(2) with unlink_or_warn	16 years ago
rerere.h	…
revision.c	Make 'git show' more useful	16 years ago
revision.h	git log: add '--merges' flag to match '--no-merges'	16 years ago
run-command.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
run-command.h	…
send-pack.h	allow OFS_DELTA objects during a push	16 years ago
server-info.c	Merge branch 'ar/unlink-err' into maint	16 years ago
setup.c	Use die_errno() instead of die() when checking syscalls	16 years ago
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	refactor: use bitsizeof() instead of 8 * sizeof()	16 years ago
sha1_name.c	sha1_name.c: avoid unnecessary strbuf_release	16 years ago
shallow.c	…
shell.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	fread does not return negative on error	16 years ago
strbuf.h	…
string-list.c	…
string-list.h	…
symlinks.c	Export thread-safe version of 'has_symlink_leading_path()'	16 years ago
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	test-chmtime: work around Windows limitation	16 years ago
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-genrandom.c	…
test-match-trees.c	…
test-parse-options.c	Fix various sparse warnings in the git source code	16 years ago
test-path-utils.c	…
test-sha1.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
test-sha1.sh	…
test-sigchain.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport.c	Merge branch 'ld/push-porcelain-output-format'	16 years ago
transport.h	add --porcelain option to git-push	16 years ago
tree-diff.c	Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'	16 years ago
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-file.c	Use die_errno() instead of die() when checking syscalls	16 years ago
unpack-trees.c	Merge branch 'maint'	16 years ago
unpack-trees.h	Optimize "diff-index --cached" using cache-tree	16 years ago
update-server-info.c	…
upload-pack.c	upload-pack: squelch progress indicator if client cannot see it	16 years ago
usage.c	die_errno(): double % in strerror() output just in case	16 years ago
userdiff.c	avoid exponential regex match for java and objc function names	16 years ago
userdiff.h	…
utf8.c	On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec	16 years ago
utf8.h	…
var.c	…
walker.c	janitor: useless checks before free	16 years ago
walker.h	…
wrapper.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
write_or_die.c	Convert existing die(..., strerror(errno)) to die_errno()	16 years ago
ws.c	Fix severe breakage in "git-apply --whitespace=fix"	16 years ago
wt-status.c	Add 'fill_directory()' helper function for directory traversal	16 years ago
wt-status.h	…
xdiff-interface.c	userdiff: add xdiff_clear_find_func()	16 years ago
xdiff-interface.h	userdiff: add xdiff_clear_find_func()	16 years ago

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.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.