kernel/git - git - PowerEL Git System

Go to file

René Scharfe 0041f09de6 use struct sha1_array in diff_tree_combined() Maintaining an array of hashes is easier using sha1_array than open-coding it. This patch also fixes a leak of the SHA1 array in diff_tree_combined_merge(). Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-12-17 18:21:37 -08:00
Documentation	Update draft release notes to 1.7.9	2011-12-16 22:45:03 -08:00
block-sha1	…
builtin	use struct sha1_array in diff_tree_combined()	2011-12-17 18:21:37 -08:00
compat	Merge branch 'maint'	2011-12-09 13:34:18 -08:00
contrib	git-p4: use absolute directory for PWD env var	2011-12-11 21:13:52 -08:00
git-gui	Merge branch 'master' of git://repo.or.cz/git-gui	2011-12-13 16:48:24 -08:00
git_remote_helpers	…
gitk-git	Merge git://ozlabs.org/~paulus/gitk	2011-12-16 22:18:42 -08:00
gitweb	Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint	2011-11-08 16:26:50 -08:00
mergetools	…
perl	Merge branch 'maint-1.7.7' into maint	2011-12-05 15:07:54 -08:00
po	…
ppc	…
t	Merge branch 'jc/commit-amend-no-edit'	2011-12-16 22:33:56 -08:00
templates	Merge branch 'maint-1.7.6' into maint	2011-10-26 16:09:28 -07:00
vcs-svn	…
xdiff	Merge branch 'rs/diff-cleanup-records-fix' into maint	2011-10-21 10:49:25 -07:00
.gitattributes	git-gui: set whitespace warnings appropriate to this project	2011-11-30 11:35:28 +00:00
.gitignore	…
.mailmap	…
COPYING	…
GIT-VERSION-GEN	Git 1.7.7.5	2011-12-13 21:55:31 -08:00
INSTALL	docs: Update install-doc-quick	2011-11-08 13:37:10 -08:00
LGPL-2.1	…
Makefile	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
README	…
RelNotes	Update draft release notes for 1.7.8.1	2011-12-13 22:08:52 -08:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'jk/maint-upload-archive'	2011-12-13 22:47:38 -08:00
archive.h	archive: don't let remote clients get unreachable commits	2011-11-21 14:42:25 -08:00
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
base85.c	…
bisect.c	Merge branch 'jk/argv-array' into maint	2011-10-26 16:13:31 -07:00
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'jn/branch-move-to-self'	2011-12-13 22:53:08 -08:00
branch.h	Merge branch 'jn/branch-move-to-self'	2011-12-13 22:53:08 -08:00
builtin.h	Merge branch 'jk/upload-archive-use-start-command'	2011-12-16 22:33:30 -08:00
bulk-checkin.c	bulk-checkin: replace fast-import based implementation	2011-12-01 11:46:09 -08:00
bulk-checkin.h	bulk-checkin: replace fast-import based implementation	2011-12-01 11:46:09 -08:00
bundle.c	Convert many resolve_ref() calls to read_ref*() and ref_exists()	2011-11-13 12:21:06 -08:00
bundle.h	Merge branch 'jc/unseekable-bundle'	2011-10-21 16:04:32 -07:00
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
combine-diff.c	use struct sha1_array in diff_tree_combined()	2011-12-17 18:21:37 -08:00
command-list.txt	…
commit.c	commit: teach --amend to carry forward extra headers	2011-11-09 22:27:11 -08:00
commit.h	commit: teach --amend to carry forward extra headers	2011-11-09 22:27:11 -08:00
config.c	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
config.mak.in	…
configure.ac	…
connect.c	…
connected.c	…
connected.h	…
convert.c	Merge branch 'cn/maint-lf-to-crlf-filter'	2011-12-13 22:49:45 -08:00
convert.h	…
copy.c	…
csum-file.c	csum-file: introduce sha1file_checkpoint	2011-11-30 14:27:59 -08:00
csum-file.h	csum-file: introduce sha1file_checkpoint	2011-11-30 14:27:59 -08:00
ctype.c	…
daemon.c	Merge branch 'jk/daemon-msgs'	2011-10-21 16:04:32 -07:00
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'cn/eradicate-working-copy' into maint	2011-10-26 16:13:31 -07:00
diff-no-index.c	…
diff.c	Merge branch 'jc/maint-diffstat-numstat-context' into maint	2011-11-01 16:10:56 -07:00
diff.h	use struct sha1_array in diff_tree_combined()	2011-12-17 18:21:37 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	read_directory_recursive: reduce one indentation level	2011-10-27 11:27:57 -07:00
dir.h	…
editor.c	…
entry.c	…
environment.c	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
fetch-pack.h	…
fixup-builtins	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-am.sh	Merge branch 'maint-1.7.7' into maint	2011-12-09 13:33:39 -08:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'js/bisect-no-checkout' into maint	2011-11-01 16:03:35 -07:00
git-compat-util.h	Merge branch 'vr/msvc'	2011-12-05 15:12:54 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	Merge branch 'js/maint-merge-one-file-osx-expr' into maint	2011-10-21 10:49:25 -07:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	Merge branch 'jm/mergetool-pathspec' into maint-1.7.6	2011-10-26 16:12:25 -07:00
git-parse-remote.sh	…
git-pull.sh	Merge branch 'ab/pull-rebase-config'	2011-12-09 13:37:01 -08:00
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	Merge branch 'aw/rebase-i-stop-on-failure-to-amend'	2011-12-16 22:33:37 -08:00
git-rebase--merge.sh	…
git-rebase.sh	Merge branch 'jk/pull-rebase-with-work-tree' into maint	2011-11-01 16:11:00 -07:00
git-relink.perl	…
git-remote-testgit.py	…
git-repack.sh	…
git-request-pull.sh	request-pull: use the annotated tag contents	2011-11-09 05:31:09 -08:00
git-send-email.perl	Merge branch 'md/smtp-tls-hello-again' into maint	2011-11-01 16:12:19 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Merge branch 'tc/submodule-clone-name-detection'	2011-10-26 16:16:32 -07:00
git-svn.perl	git-svn.perl: close the edit for propedits even with no mods	2011-12-01 14:25:30 -08:00
git-web--browse.sh	…
git.c	upload-archive: use start_command instead of fork	2011-11-21 14:32:40 -08:00
git.spec.in	…
gpg-interface.c	Split GPG interface into its own helper library	2011-11-04 21:40:25 -07:00
gpg-interface.h	Split GPG interface into its own helper library	2011-11-04 21:40:25 -07:00
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.c	…
hash.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	Merge branch 'jk/http-auth'	2011-10-17 21:37:15 -07:00
http-push.c	Merge branch 'jc/match-refs-clarify'	2011-10-21 16:04:35 -07:00
http-walker.c	…
http.c	Merge branch 'mf/curl-select-fdset' into maint	2011-12-13 22:03:17 -08:00
http.h	Merge branch 'mf/curl-select-fdset' into maint	2011-12-13 22:03:17 -08:00
ident.c	…
imap-send.c	Merge branch 'maint' into tj/imap-send-remove-unused	2011-11-23 13:28:53 -08:00
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
list-objects.c	tree_entry_interesting(): give meaningful names to return values	2011-10-27 11:38:24 -07:00
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	Merge branch 'js/log-show-children'	2011-10-18 21:59:12 -07:00
log-tree.h	…
mailmap.c	Merge branch 'ml/mailmap' into maint-1.7.6	2011-12-13 21:12:14 -08:00
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-file.h	…
merge-recursive.c	merge: make usage of commit->util more extensible	2011-11-08 10:36:53 -08:00
merge-recursive.h	…
name-hash.c	name-hash.c: always initialize dir_next pointer	2011-11-01 15:29:18 -07:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'nd/resolve-ref'	2011-12-09 13:37:14 -08:00
notes-merge.h	…
notes.c	…
notes.h	…
object.c	receive-pack, fetch-pack: reject bogus pack that records objects twice	2011-11-16 22:05:21 -08:00
object.h	…
pack-check.c	fsck: print progress	2011-11-06 20:31:28 -08:00
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
pack.h	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
pager.c	…
parse-options-cb.c	…
parse-options.c	…
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 'nd/pretty-commit-log-message'	2011-11-01 15:20:03 -07:00
progress.c	…
progress.h	…
quote.c	Merge branch 'jk/argv-array' into maint	2011-10-26 16:13:31 -07:00
quote.h	…
reachable.c	reachable: per-object progress	2011-11-07 22:12:19 -08:00
reachable.h	prune: show progress while marking reachable objects	2011-11-07 22:12:19 -08:00
read-cache.c	Merge branch 'rs/allocate-cache-entry-individually'	2011-12-09 13:36:56 -08:00
reflog-walk.c	Copy resolve_ref() return value for longer use	2011-12-05 16:21:06 -08:00
reflog-walk.h	…
refs.c	Merge branch 'nd/resolve-ref'	2011-12-09 13:37:14 -08:00
refs.h	Merge branch 'jc/broken-ref-dwim-fix'	2011-10-21 16:04:36 -07:00
remote-curl.c	Merge branch 'sp/smart-http-failure' into maint	2011-11-01 15:45:16 -07:00
remote.c	Convert many resolve_ref() calls to read_ref*() and ref_exists()	2011-11-13 12:21:06 -08:00
remote.h	Merge branch 'cn/fetch-prune'	2011-10-26 16:16:29 -07:00
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'nd/maint-autofix-tag-in-head' into maint	2011-10-21 10:49:26 -07:00
revision.h	…
run-command.c	Merge branch 'jk/argv-array' into maint	2011-10-26 16:13:31 -07:00
run-command.h	…
send-pack.h	…
sequencer.c	…
sequencer.h	revert: rename --reset option to --quit	2011-11-22 13:30:35 -08:00
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jc/stream-to-pack'	2011-12-16 22:33:40 -08:00
sha1_name.c	Merge branch 'jc/broken-ref-dwim-fix'	2011-10-21 16:04:36 -07:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	fmt-merge-msg: Add contents of merged tag in the merge message	2011-11-08 10:36:18 -08:00
strbuf.h	fmt-merge-msg: Add contents of merged tag in the merge message	2011-11-08 10:36:18 -08:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
submodule.c	use struct sha1_array in diff_tree_combined()	2011-12-17 18:21:37 -08:00
submodule.h	…
symlinks.c	…
tag.c	Split GPG interface into its own helper library	2011-11-04 21:40:25 -07: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	…
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	Merge branch 'jc/match-refs-clarify'	2011-10-21 16:04:35 -07:00
transport.h	…
tree-diff.c	tree_entry_interesting(): give meaningful names to return values	2011-10-27 11:38:24 -07:00
tree-walk.c	tree_entry_interesting: make use of local pointer "item"	2011-10-27 11:38:24 -07:00
tree-walk.h	tree_entry_interesting(): give meaningful names to return values	2011-10-27 11:38:24 -07:00
tree.c	tree_entry_interesting(): give meaningful names to return values	2011-10-27 11:38:24 -07:00
tree.h	…
unimplemented.sh	…
unpack-trees.c	tree-walk.c: do not leak internal structure in tree_entry_len()	2011-10-27 11:08:26 -07:00
unpack-trees.h	…
upload-pack.c	…
url.c	Merge branch 'jk/http-auth'	2011-10-17 21:37:15 -07:00
url.h	…
usage.c	…
userdiff.c	Merge branch 'tr/userdiff-c-returns-pointer'	2011-12-13 22:57:19 -08: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	Merge branch 'maint-1.7.5' into maint-1.7.6	2011-10-26 16:08:19 -07:00
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	bulk-checkin: replace fast-import based implementation	2011-12-01 11:46:09 -08: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.