kernel/git - git - PowerEL Git System

Go to file

Jakub Narebski e72c0eaf9b gitweb: Add combined diff support to git_patchset_body Calling convention for combined diff similar to the one for git_difftree_body subroutine: difftree info (first parameter) must be result of calling git-diff-tree with -c/--cc option, and all parents of a commit must be passed as last parameters. See also description in "gitweb: Add combined diff support to git_difftree_body" This ability is not used yet. Generating "src" file name for renames in combined diff was separated into fill_from_file_info subroutine; git_difftree_body was modified to use it. Currently git_difftree_body and git_patchset_body fills this info separately. The from-file line in two-line from-file/to-file header is not hyperlinked: there can be more than one "from"/"src" file. This differs from HTML output of ordinary (not combined) diff. format_diff_line subroutine needs extra $from/$to parameters to format combined diff patch line correctly. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>		2007-05-07 18:20:19 -07:00
Documentation	Fix minor documentation errors	2007-05-07 15:39:57 -07:00
arm	…
compat	…
contrib	Merge branch 'gfi-maint' into gfi-master	2007-05-02 13:24:10 -04:00
git-gui	Merge branch 'master' of git://repo.or.cz/git-gui	2007-05-07 14:47:14 -07:00
gitweb	gitweb: Add combined diff support to git_patchset_body	2007-05-07 18:20:19 -07:00
mozilla-sha1	…
perl	Allow PERL_PATH="/usr/bin/env perl"	2007-05-03 22:36:32 -07:00
ppc	…
t	t7300: Basic tests for git-clean	2007-05-07 15:34:55 -07:00
templates	Have sample update hook not refuse deleting a branch through push.	2007-04-16 01:35:39 -07:00
xdiff	…
.gitignore	Merge branch 'jc/attr'	2007-04-21 17:38:00 -07:00
.mailmap	Update .mailmap with "Michael"	2007-04-29 01:34:59 -07:00
COPYING	…
GIT-VERSION-GEN	GIT v1.5.2-rc2	2007-05-06 01:07:04 -07:00
INSTALL	…
Makefile	Create pack-write.c for common pack writing code	2007-05-02 13:24:18 -04:00
README	…
RelNotes	Start preparing for 1.5.1.3	2007-04-25 23:27:07 -07:00
alloc.c	Clean up object creation to use more common code	2007-04-16 23:36:16 -07:00
archive-tar.c	…
archive-zip.c	…
archive.h	…
attr.c	Fix crash in t0020 (crlf conversion)	2007-04-22 10:44:56 -07:00
attr.h	Fix funny types used in attribute value representation	2007-04-18 16:17:13 -07:00
base85.c	(encode_85, decode_85): Mark source buffer pointer as "const".	2007-04-11 00:51:20 -07:00
blob.c	Clean up object creation to use more common code	2007-04-16 23:36:16 -07:00
blob.h	…
builtin-add.c	git-add -u: match the index with working tree.	2007-04-20 01:47:47 -07:00
builtin-annotate.c	…
builtin-apply.c	Merge branch 'jc/attr'	2007-04-21 17:38:00 -07:00
builtin-archive.c	git-archive: make tar the default format	2007-04-09 18:51:40 -07:00
builtin-blame.c	Merge branch 'maint'	2007-05-06 00:21:03 -07:00
builtin-branch.c	Make builtin-branch.c handle the git config file	2007-04-06 16:54:39 -07:00
builtin-bundle.c	…
builtin-cat-file.c	Cleanup variables in cat-file	2007-04-22 00:43:24 -07:00
builtin-check-attr.c	Fix funny types used in attribute value representation	2007-04-18 16:17:13 -07:00
builtin-check-ref-format.c	…
builtin-checkout-index.c	…
builtin-commit-tree.c	init_buffer(): Kill buf pointer	2007-04-25 13:45:12 -07:00
builtin-config.c	Update git-config documentation	2007-04-18 22:08:16 -07:00
builtin-count-objects.c	get rid of num_packed_objects()	2007-04-10 12:48:14 -07:00
builtin-describe.c	…
builtin-diff-files.c	Removing -n option from git-diff-files documentation	2007-04-26 22:43:10 -07:00
builtin-diff-index.c	…
builtin-diff-tree.c	…
builtin-diff.c	Diff between two blobs should take mode changes into account now.	2007-04-24 00:08:49 -07:00
builtin-fetch--tool.c	Merge branch 'maint'	2007-04-29 01:52:43 -07:00
builtin-fmt-merge-msg.c	…
builtin-for-each-ref.c	…
builtin-fsck.c	Merge branch 'maint'	2007-04-29 01:52:43 -07:00
builtin-gc.c	…
builtin-grep.c	sscanf/strtoul: parse integers robustly	2007-04-14 19:47:20 -07:00
builtin-init-db.c	…
builtin-log.c	Add support for "commit name decorations" to log family of commands	2007-04-16 16:51:11 -07:00
builtin-ls-files.c	Fix some "git ls-files -o" fallout from gitlinks	2007-04-14 17:42:58 -07:00
builtin-ls-tree.c	Teach core object handling functions about gitlinks	2007-04-10 13:50:43 -07:00
builtin-mailinfo.c	…
builtin-mailsplit.c	…
builtin-merge-base.c	…
builtin-merge-file.c	…
builtin-mv.c	Merge branch 'jc/index-output'	2007-04-07 02:26:24 -07:00
builtin-name-rev.c	…
builtin-pack-objects.c	Use GIT_OBJECT_DIR for temporary files of pack-objects	2007-05-07 15:45:24 -07:00
builtin-pack-refs.c	…
builtin-prune-packed.c	…
builtin-prune.c	…
builtin-push.c	git-push to multiple locations does not stop at the first failure	2007-04-07 02:27:31 -07:00
builtin-read-tree.c	Merge branch 'jc/read-tree-df' (early part)	2007-04-07 23:52:40 -07:00
builtin-reflog.c	…
builtin-rerere.c	…
builtin-rev-list.c	Add --date={local,relative,default}	2007-04-25 21:39:43 -07:00
builtin-rev-parse.c	…
builtin-revert.c	…
builtin-rm.c	Add --ignore-unmatch option to exit with zero status when no files are removed.	2007-04-17 00:19:11 -07:00
builtin-runstatus.c	…
builtin-shortlog.c	Remove pointless calls to access(2) when checking for .mailmap	2007-04-30 16:57:52 -07:00
builtin-show-branch.c	…
builtin-show-ref.c	…
builtin-stripspace.c	…
builtin-symbolic-ref.c	…
builtin-tar-tree.c	…
builtin-unpack-objects.c	make progress "title" part of the common progress interface	2007-04-22 22:18:05 -07:00
builtin-update-index.c	Merge branch 'lt/gitlink'	2007-04-21 17:21:10 -07:00
builtin-update-ref.c	…
builtin-upload-archive.c	…
builtin-verify-pack.c	…
builtin-write-tree.c	Merge branch 'maint'	2007-04-25 23:31:45 -07:00
builtin.h	Add basic infrastructure to assign attributes to paths	2007-04-14 08:57:06 -07:00
cache-tree.c	Teach core object handling functions about gitlinks	2007-04-10 13:50:43 -07:00
cache-tree.h	…
cache.h	Add --date={local,relative,default}	2007-04-25 21:39:43 -07:00
check-builtins.sh	…
check-racy.c	…
color.c	…
color.h	…
combine-diff.c	Support 'diff=pgm' attribute	2007-04-22 22:16:14 -07:00
commit.c	Merge branch 'maint'	2007-05-06 00:21:03 -07:00
commit.h	Add --date={local,relative,default}	2007-04-25 21:39:43 -07:00
config.c	…
config.mak.in	…
configure.ac	…
connect.c	…
convert-objects.c	fix up strtoul_ui error handling	2007-04-18 19:26:33 -07:00
convert.c	Add 'filter' attribute and external filter driver definition.	2007-04-24 22:38:51 -07:00
copy.c	…
csum-file.c	compute a CRC32 for each object as stored in a pack	2007-04-10 12:48:14 -07:00
csum-file.h	compute a CRC32 for each object as stored in a pack	2007-04-10 12:48:14 -07:00
ctype.c	…
daemon.c	…
date.c	Add --date={local,relative,default}	2007-04-25 21:39:43 -07:00
decorate.c	Fix a copy-n-paste bug in the object decorator code.	2007-04-20 19:16:12 -07:00
decorate.h	Add a generic "object decorator" interface, and make object refs use it	2007-04-16 16:51:09 -07:00
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'lt/gitlink'	2007-04-21 17:21:10 -07:00
diff.c	Merge branch 'maint'	2007-05-03 23:26:54 -07:00
diff.h	Support 'diff=pgm' attribute	2007-04-22 22:16:14 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	Make macros to prevent double-inclusion in headers consistent.	2007-04-29 02:05:11 -07:00
dir.c	dir.c: Omit non-excluded directories with dir->show_ignored	2007-05-07 15:29:29 -07:00
dir.h	Teach directory traversal about subprojects	2007-04-11 19:09:55 -07:00
dump-cache-tree.c	…
entry.c	entry.c: Use const qualifier for 'struct checkout' parameters	2007-04-25 13:15:59 -07:00
environment.c	…
exec_cmd.c	…
exec_cmd.h	Make macros to prevent double-inclusion in headers consistent.	2007-04-29 02:05:11 -07:00
fast-import.c	Create pack-write.c for common pack writing code	2007-05-02 13:24:18 -04:00
fetch-pack.c	…
fetch.c	…
fetch.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	…
git-am.sh	Fix typo in git-am: s/Was is/Was it/	2007-04-23 22:14:24 -07:00
git-applymbox.sh	applymbox & quiltimport: typofix.	2007-04-24 14:27:41 -07:00
git-applypatch.sh	…
git-archimport.perl	…
git-bisect.sh	Bisect: simplify "bisect start" logging.	2007-04-16 21:44:40 -07:00
git-checkout.sh	add file checkout progress	2007-04-23 21:39:28 -07:00
git-clean.sh	Add clean.requireForce option, and add -f option to git-clean to override it	2007-04-23 22:13:50 -07:00
git-clone.sh	git-clone: fix dumb protocol transport to clone from pack-pruned ref	2007-04-20 17:25:27 -07:00
git-commit.sh	Display the subject of the commit just made.	2007-04-16 01:06:00 -07:00
git-compat-util.h	Merge branch 'maint'	2007-05-03 23:26:54 -07:00
git-cvsexportcommit.perl	cvsexportcommit -p : fix the usage of git-apply -C.	2007-04-09 18:52:41 -07:00
git-cvsimport.perl	cvsimport: Improve usage error reporting	2007-04-06 16:46:11 -07:00
git-cvsserver.perl	Merge branch 'maint'	2007-05-02 11:27:31 -07:00
git-fetch.sh	git-fetch: Fix "argument list too long"	2007-04-24 00:08:01 -07:00
git-instaweb.sh	…
git-lost-found.sh	Fix lost-found to show commits only referenced by reflogs	2007-04-05 15:00:03 -07:00
git-ls-remote.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-ours.sh	…
git-merge-resolve.sh	…
git-merge-stupid.sh	…
git-merge.sh	A new merge stragety 'subtree'.	2007-04-07 02:29:40 -07:00
git-mergetool.sh	…
git-p4import.py	…
git-parse-remote.sh	…
git-pull.sh	…
git-quiltimport.sh	applymbox & quiltimport: typofix.	2007-04-24 14:27:41 -07:00
git-rebase.sh	Use rev-list --reverse in git-rebase.sh	2007-04-13 19:06:40 -07:00
git-relink.perl	…
git-remote.perl	…
git-repack.sh	…
git-request-pull.sh	Improve request-pull to handle non-rebased branches	2007-05-03 23:27:03 -07:00
git-reset.sh	add file checkout progress	2007-04-23 21:39:28 -07:00
git-send-email.perl	Merge branch 'maint'	2007-04-25 23:31:45 -07:00
git-sh-setup.sh	…
git-svn.perl	Add --no-rebase option to git-svn dcommit	2007-05-04 15:08:31 -07:00
git-svnimport.perl	…
git-tag.sh	…
git-verify-tag.sh	…
git.c	Add basic infrastructure to assign attributes to paths	2007-04-14 08:57:06 -07:00
git.spec.in	Merge branch 'maint'	2007-04-24 00:08:16 -07:00
gitk	gitk: Allow user to choose whether to see the diff, old file, or new file	2007-04-19 11:39:12 +10:00
grep.c	…
grep.h	…
hash-object.c	…
help.c	…
http-fetch.c	Fix lseek(2) calls with args 2 and 3 swapped	2007-04-05 15:39:12 -07:00
http-push.c	Fix lseek(2) calls with args 2 and 3 swapped	2007-04-05 15:39:12 -07:00
http.c	http.c: Fix problem with repeated calls of http_init	2007-04-29 01:34:59 -07:00
http.h	http-fetch: Disable use of curl multi support for libcurl < 7.16.	2007-05-03 22:12:40 -07:00
ident.c	Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL	2007-04-29 02:05:06 -07:00
imap-send.c	…
index-pack.c	Reuse fixup_pack_header_footer in index-pack	2007-05-02 13:24:21 -04:00
interpolate.c	…
interpolate.h	…
list-objects.c	Teach git list-objects logic to not follow gitlinks	2007-04-14 03:14:14 -07:00
list-objects.h	…
local-fetch.c	…
lockfile.c	lockfile: record the primary process.	2007-04-21 11:55:23 -07:00
log-tree.c	Merge branch 'maint'	2007-05-06 00:21:03 -07:00
log-tree.h	…
mailmap.c	Include mailmap.h in mailmap.c to catch mailmap interface changes	2007-04-30 16:57:59 -07:00
mailmap.h	Split out mailmap handling out of shortlog	2007-04-29 02:05:06 -07:00
match-trees.c	A new merge stragety 'subtree'.	2007-04-07 02:29:40 -07:00
merge-file.c	…
merge-index.c	…
merge-recursive.c	Ignore merged status of the file-level merge	2007-04-26 16:11:39 -07:00
merge-tree.c	…
mktag.c	…
mktree.c	…
object-refs.c	Add a generic "object decorator" interface, and make object refs use it	2007-04-16 16:51:09 -07:00
object.c	add add_object_array_with_mode	2007-04-24 00:08:49 -07:00
object.h	add add_object_array_with_mode	2007-04-24 00:08:49 -07:00
pack-check.c	get rid of num_packed_objects()	2007-04-10 12:48:14 -07:00
pack-redundant.c	pack-redundant.c: learn about index v2	2007-04-10 12:48:14 -07:00
pack-write.c	Create pack-write.c for common pack writing code	2007-05-02 13:24:18 -04:00
pack.h	Create pack-write.c for common pack writing code	2007-05-02 13:24:18 -04:00
pager.c	…
patch-delta.c	…
patch-id.c	…
patch-ids.c	Refactor patch-id filtering out of git-cherry and git-format-patch.	2007-04-11 20:02:03 -07:00
patch-ids.h	Refactor patch-id filtering out of git-cherry and git-format-patch.	2007-04-11 20:02:03 -07:00
path-list.c	…
path-list.h	Make macros to prevent double-inclusion in headers consistent.	2007-04-29 02:05:11 -07:00
path.c	…
peek-remote.c	…
pkt-line.c	…
pkt-line.h	…
progress.c	provide a facility for "delayed" progress reporting	2007-04-22 22:18:05 -07:00
progress.h	Make macros to prevent double-inclusion in headers consistent.	2007-04-29 02:05:11 -07:00
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	read_cache_from(): small simplification	2007-04-25 13:44:27 -07:00
receive-pack.c	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'lt/gitlink'	2007-04-21 17:21:10 -07:00
refs.h	Add 'resolve_gitlink_ref()' helper function	2007-04-10 13:44:16 -07:00
revision.c	Handle return code of parse_commit in revision machinery	2007-05-06 00:07:07 -07:00
revision.h	Handle return code of parse_commit in revision machinery	2007-05-06 00:07:07 -07:00
rsh.c	…
rsh.h	…
run-command.c	…
run-command.h	…
send-pack.c	…
server-info.c	…
setup.c	…
sha1_file.c	Merge branch 'maint'	2007-04-25 23:31:45 -07:00
sha1_name.c	add get_sha1_with_mode	2007-04-24 00:08:49 -07:00
shallow.c	…
shell.c	…
show-index.c	show-index.c: learn about index v2	2007-04-10 12:48:14 -07:00
sideband.c	…
sideband.h	…
ssh-fetch.c	…
ssh-pull.c	…
ssh-push.c	…
ssh-upload.c	…
strbuf.c	…
strbuf.h	…
tag.c	Clean up object creation to use more common code	2007-04-16 23:36:16 -07:00
tag.h	…
tar.h	…
test-chmtime.c	…
test-date.c	…
test-delta.c	Fix compilation of test-delta	2007-05-01 02:59:08 -07:00
test-genrandom.c	simple random data generator for tests	2007-04-11 19:23:32 -07:00
test-match-trees.c	A new merge stragety 'subtree'.	2007-04-07 02:29:40 -07:00
test-sha1.c	…
test-sha1.sh	…
trace.c	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	Merge branch 'lt/objalloc'	2007-04-21 17:42:02 -07:00
tree.h	…
unpack-file.c	…
unpack-trees.c	delay progress display when checking out files	2007-04-22 22:18:05 -07:00
unpack-trees.h	…
update-server-info.c	…
upload-pack.c	…
usage.c	…
utf8.c	…
utf8.h	…
var.c	…
write_or_die.c	…
wt-status.c	…
wt-status.h	…
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/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

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.