kernel/git - git - PowerEL Git System

Go to file

Jeff King 4d5f347199 combine-diff: handle binary files as binary The combined diff code path is totally different from the regular diff code path, and didn't handle binary files at all. The results of a combined diff on a binary file could range from annoying (since we spewed binary garbage, possibly upsetting the user's terminal), to wrong (embedded NULs caused us to show incorrect diffs, with lines truncated at the NUL character), to potential security problems (embedded NULs could interfere with "-z" output, possibly defeating policy hooks which parse diff output). Instead, we consider a combined diff to be binary if any of the input blobs is binary. To show a binary combined diff, we indicate "Binary blobs differ"; the "index" meta line will show which parents had which blob. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-05-23 15:43:43 -07:00
Documentation	Update draft release notes to 1.7.6	2011-05-19 21:02:20 -07:00
block-sha1	…
builtin	Merge branch 'jc/replacing'	2011-05-19 20:37:21 -07:00
compat	remove doubled words, e.g., s/to to/to/, and fix related typos	2011-04-13 11:59:11 -07:00
contrib	Merge branch 'ld/p4-preserve-user-names'	2011-05-19 20:37:20 -07:00
git-gui	Merge git-gui 0.14.0	2011-03-26 10:42:35 -07:00
git_remote_helpers	…
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2011-04-11 09:33:06 -07:00
gitweb	Merge branch 'jn/ctags'	2011-05-11 11:37:32 -07:00
perl	…
po	i18n: Makefile: "pot" target to extract messages marked for translation	2011-03-09 23:52:52 -08:00
ppc	…
t	combine-diff: handle binary files as binary	2011-05-23 15:43:43 -07:00
templates	…
vcs-svn	Merge branch 'rj/sparse'	2011-04-27 11:36:42 -07:00
xdiff	…
.gitattributes	…
.gitignore	Merge branch 'mz/rebase'	2011-04-28 14:11:39 -07:00
.mailmap	…
COPYING	…
GIT-VERSION-GEN	Git 1.7.5.2	2011-05-19 20:30:44 -07:00
INSTALL	…
LGPL-2.1	provide a copy of the LGPLv2.1	2011-05-19 18:23:17 -07:00
Makefile	Makefile: sort TEST_PROGRAMS list	2011-05-19 19:44:59 -07:00
README	…
RelNotes	Prepare for 1.7.5.2	2011-05-13 10:57:09 -07:00
abspath.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	unbreak and eliminate NO_C99_FORMAT	2011-03-17 15:30:49 -07:00
archive-tar.c	…
archive-zip.c	…
archive.c	Convert read_tree{,_recursive} to support struct pathspec	2011-03-25 09:20:33 -07:00
archive.h	…
attr.c	sparse: Fix some "symbol not declared" warnings	2011-04-22 10:04:27 -07:00
attr.h	…
base85.c	…
bisect.c	…
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'jh/maint-do-not-track-non-branches'	2011-03-15 14:22:13 -07:00
branch.h	…
builtin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jc/replacing'	2011-05-19 20:37:21 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	Share color list between graph and show-branch	2011-04-04 23:20:39 -07:00
color.h	Share color list between graph and show-branch	2011-04-04 23:20:39 -07:00
combine-diff.c	combine-diff: handle binary files as binary	2011-05-23 15:43:43 -07:00
command-list.txt	…
commit.c	…
commit.h	Merge branch 'jc/replacing'	2011-05-19 20:37:21 -07:00
config.c	convert: rename the "eol" global variable to "core_eol"	2011-05-09 14:58:52 -07:00
config.mak.in	unbreak and eliminate NO_C99_FORMAT	2011-03-17 15:30:49 -07:00
configure.ac	Improve test for pthreads flag	2011-03-28 10:54:54 -07:00
connect.c	Merge branch 'jk/git-connection-deadlock-fix'	2011-05-19 20:37:20 -07:00
convert.c	convert: make it harder to screw up adding a conversion attribute	2011-05-09 14:59:09 -07:00
copy.c	…
csum-file.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
csum-file.h	…
ctype.c	…
daemon.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
date.c	date: avoid "X years, 12 months" in relative dates	2011-04-20 19:23:16 -07:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'jc/fix-diff-files-unmerged' into maint	2011-05-13 10:41:54 -07:00
diff-no-index.c	…
diff.c	Merge branch 'jh/dirstat-lines'	2011-05-13 11:01:32 -07:00
diff.h	Merge branch 'jh/dirstat-lines'	2011-05-13 11:01:32 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	Merge branch 'mz/maint-rename-unmerged' into maint	2011-05-13 10:41:24 -07:00
diffcore.h	…
dir.c	Merge branch 'nd/struct-pathspec'	2011-05-06 10:50:06 -07:00
dir.h	Merge branch 'nd/maint-setup'	2011-05-02 15:58:30 -07:00
editor.c	…
entry.c	…
environment.c	Merge branch 'jc/replacing'	2011-05-19 20:37:21 -07:00
exec_cmd.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
exec_cmd.h	…
fast-import.c	fast-import: fix option parser for no-arg options	2011-05-05 21:21:24 -07:00
fetch-pack.h	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
fixup-builtins	…
fsck.c	strbuf: add strbuf_vaddf	2011-02-26 01:06:50 -08:00
fsck.h	…
generate-cmdlist.sh	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
gettext.c	i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set	2011-03-08 12:10:03 -08:00
gettext.h	i18n: avoid parenthesized string as array initializer	2011-04-11 10:33:51 -07:00
git-add--interactive.perl	"add -p": work-around an old laziness that does not coalesce hunks	2011-04-29 15:27:59 -07:00
git-am.sh	…
git-archimport.perl	…
git-bisect.sh	bisect: visualize with git-log if gitk is unavailable	2011-03-21 10:23:45 -07:00
git-compat-util.h	Merge branch 'maint'	2011-04-03 13:53:11 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint	2011-05-13 10:44:54 -07:00
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	…
git-instaweb.sh	git-instaweb: Change how gitweb.psgi is made runnable as standalone app	2011-02-27 22:02:31 -08:00
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	Merge branch 'jk/merge-one-file-working-tree' into maint	2011-05-13 10:44:19 -07:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	Pass empty file to p4merge where no base is suitable.	2011-05-01 15:56:05 -07:00
git-mergetool.sh	mergetool: Teach about submodules	2011-04-13 12:21:45 -07:00
git-parse-remote.sh	Merge branch 'mz/rebase'	2011-04-28 14:11:39 -07:00
git-pull.sh	Merge branch 'mz/rebase'	2011-04-28 14:11:39 -07:00
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'aw/maint-rebase-i-p-no-ff'	2011-05-06 10:50:00 -07:00
git-rebase--merge.sh	…
git-rebase.sh	rebase: define options in OPTIONS_SPEC	2011-03-04 16:10:06 -08:00
git-relink.perl	…
git-remote-testgit.py	…
git-repack.sh	…
git-request-pull.sh	git-request-pull: open-code the only invocation of get_remote_url	2011-03-02 12:26:58 -08:00
git-send-email.perl	git-send-email: fix missing space in error message	2011-04-29 11:34:32 -07:00
git-sh-setup.sh	…
git-stash.sh	Merge branch 'jk/maint-stash-oob' into maint	2011-05-04 14:58:42 -07:00
git-submodule.sh	Merge branch 'nm/submodule-update-force'	2011-05-02 15:58:36 -07:00
git-svn.perl	Merge branch 'maint'	2011-05-20 18:50:29 -07:00
git-web--browse.sh	…
git.c	Merge branch 'js/info-man-path'	2011-05-06 11:00:46 -07:00
git.spec.in	…
graph.c	Share color list between graph and show-branch	2011-04-04 23:20:39 -07:00
graph.h	…
grep.c	…
grep.h	…
hash.c	for_each_hash: allow passing a 'void *data' pointer to callback	2011-02-18 22:25:51 -08:00
hash.h	for_each_hash: allow passing a 'void *data' pointer to callback	2011-02-18 22:25:51 -08:00
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	Fix two unused variable warnings in gcc 4.6	2011-04-03 10:59:40 -07:00
http-push.c	http-push: refactor curl_easy_setup madness	2011-05-04 13:30:28 -07:00
http-walker.c	http: make curl callbacks match contracts from curl header	2011-05-04 13:30:28 -07:00
http.c	Merge branch 'sp/maint-clear-postfields' into maint	2011-05-04 14:58:56 -07:00
http.h	http: make curl callbacks match contracts from curl header	2011-05-04 13:30:28 -07:00
ident.c	Merge branch 'rg/copy-gecos-username'	2011-05-19 20:37:21 -07:00
imap-send.c	sparse: Fix some "Using plain integer as NULL pointer" warnings	2011-04-11 10:35:25 -07:00
levenshtein.c	…
levenshtein.h	…
list-objects.c	Merge branch 'nd/struct-pathspec'	2011-05-06 10:50:06 -07:00
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
log-tree.c	git-log: put space after commit mark	2011-03-10 21:55:29 -08:00
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-file.c	sparse: Fix an "symbol 'merge_file' not decared" warning	2011-04-11 10:35:25 -07:00
merge-file.h	sparse: Fix an "symbol 'merge_file' not decared" warning	2011-04-11 10:35:25 -07:00
merge-recursive.c	Revert "Merge branch 'en/merge-recursive'"	2011-05-19 20:33:38 -07:00
merge-recursive.h	Merge branch 'jk/merge-rename-ux'	2011-03-19 23:23:56 -07:00
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
notes-merge.h	…
notes.c	notes: refactor display notes default handling	2011-03-29 14:31:59 -07:00
notes.h	notes: refactor display notes default handling	2011-03-29 14:31:59 -07:00
object.c	read_sha1_file(): get rid of read_sha1_file_repl() madness	2011-05-15 15:23:33 -07:00
object.h	object.h: Remove obsolete struct object_refs	2011-03-14 10:49:28 -07:00
pack-check.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
pkt-line.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'jk/format-patch-quote-special-in-from' into maint	2011-05-15 15:56:44 -07:00
progress.c	…
progress.h	…
quote.c	…
quote.h	…
reachable.c	Remove unused variables	2011-03-22 11:43:27 -07:00
reachable.h	…
read-cache.c	Merge branch 'jc/index-update-if-able' into maint	2011-04-03 12:33:05 -07:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote-curl.c	http: make curl callbacks match contracts from curl header	2011-05-04 13:30:28 -07:00
remote.c	…
remote.h	…
replace_object.c	inline lookup_replace_object() calls	2011-05-15 15:23:33 -07:00
rerere.c	rerere: libify rerere_clear() and rerere_gc()	2011-05-08 12:55:34 -07:00
rerere.h	rerere: libify rerere_clear() and rerere_gc()	2011-05-08 12:55:34 -07:00
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jc/maint-pathspec-stdin-and-cmdline'	2011-05-19 20:37:18 -07:00
revision.h	rev-list --count: separate count for --cherry-mark	2011-04-26 13:13:20 -07:00
run-command.c	run-command: handle short writes and EINTR in die_child	2011-04-20 10:09:26 -07:00
run-command.h	…
send-pack.h	…
server-info.c	…
setup.c	Merge branch 'nd/maint-setup'	2011-05-02 15:58:30 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jc/replacing'	2011-05-19 20:37:21 -07:00
sha1_name.c	sha1_name: Suggest commit:./file for path in subdir	2011-04-03 12:24:27 -07:00
shallow.c	…
shell.c	shell: add missing initialization of argv0_path	2011-05-05 09:32:28 -07:00
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	Merge branch 'ef/maint-strbuf-init'	2011-04-27 11:36:43 -07:00
strbuf.h	strbuf: clarify assertion in strbuf_setlen()	2011-04-27 10:52:15 -07:00
string-list.c	…
string-list.h	standardize brace placement in struct definitions	2011-03-16 12:49:02 -07:00
submodule.c	Submodules: Don't parse .gitmodules when it contains, merge conflicts	2011-05-14 10:57:56 -07:00
submodule.h	fetch/pull: Add the 'on-demand' value to the --recurse-submodules option	2011-03-09 13:10:35 -08:00
symlinks.c	do not overwrite untracked symlinks	2011-02-21 22:51:07 -08:00
tag.c	parse_tag_buffer(): do not prefixcmp() out of range	2011-02-16 10:05:14 -08:00
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	vcs-svn: remove buffer_read_string	2011-03-26 00:17:35 -05:00
test-match-trees.c	…
test-mktemp.c	…
test-obj-pool.c	…
test-parse-options.c	…
test-path-utils.c	Name make_*_path functions more accurately	2011-03-17 16:08:30 -07:00
test-run-command.c	tests: check error message from run_command	2011-04-20 10:08:54 -07:00
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-pool.c	…
test-subprocess.c	Remove unused variables	2011-03-22 11:43:27 -07:00
test-svn-fe.c	…
test-treap.c	…
thread-utils.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
thread-utils.h	…
trace.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
transport-helper.c	Remove unused variables	2011-03-22 11:43:27 -07:00
transport.c	Merge branch 'jc/maint-fetch-alt'	2011-03-22 21:37:53 -07:00
transport.h	refs_from_alternate: helper to use refs from alternates	2011-03-17 16:18:47 -07:00
tree-diff.c	Merge branch 'nd/struct-pathspec'	2011-05-06 10:50:06 -07:00
tree-walk.c	pathspec: rename per-item field has_wildcard to use_wildcard	2011-04-05 09:30:36 -07:00
tree-walk.h	…
tree.c	Convert read_tree{,_recursive} to support struct pathspec	2011-03-25 09:20:33 -07:00
tree.h	Convert read_tree{,_recursive} to support struct pathspec	2011-03-25 09:20:33 -07:00
unimplemented.sh	…
unpack-trees.c	sparse checkout: do not eagerly decide the fate for whole directory	2011-05-10 09:04:26 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'jk/maint-upload-pack-shallow' into maint	2011-05-04 14:58:13 -07:00
url.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
url.h	…
usage.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
userdiff.c	…
userdiff.h	…
utf8.c	strbuf: add fixed-length version of add_wrapped_text	2011-02-23 13:44:36 -08:00
utf8.h	strbuf: add fixed-length version of add_wrapped_text	2011-02-23 13:44:36 -08:00
walker.c	…
walker.h	…
wrap-for-bin.sh	…
wrapper.c	Merge branch 'ae/better-template-failure-report' into maint	2011-03-20 22:09:39 -07:00
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
wt-status.h	Merge branch 'jn/status-translatable'	2011-03-19 23:24:19 -07:00
xdiff-interface.c	add, merge, diff: do not use strcasecmp to compare config variable names	2011-05-14 18:53:39 -07:00
xdiff-interface.h	…
zlib.c	…

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.