kernel/git - git - PowerEL Git System

Go to file

Johannes Sixt a17171b473 Revert "filter-branch: subdirectory filter needs --full-history" This reverts commit `cfabd6eee1`. I had implemented it without understanding what --full-history does. Consider this history: C--M--N / / / A--B / \ / D-/ where B and C modify a path, X, in the same way so that the result is identical, and D does not modify it at all. With the path limiter X and without --full-history this is simplified to A--B i.e. only one of the paths via B or C is chosen. I had assumed that --full-history would keep both paths like this C--M / / A--B removing the path via D; but in fact it keeps the entire history. Currently, git does not have the capability to simplify to this intermediary case. However, the other extreme to keep the entire history is not wanted either in usual cases. I think we can expect that histories like the above are rare, and in the usual cases we want a simplified history. So let's remove --full-history again. (Concerning t7003, subsequent tests depend on what the test case sets up, so we can't just back out the entire test case.) Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2008-05-27 22:27:30 -07:00
Documentation	Documentation/git-bundle.txt: fix synopsis	2008-05-27 22:01:31 -07:00
arm	…
compat	Add compat/snprintf.c for systems that return bogus	2008-03-05 13:12:07 -08:00
contrib	post-receive-email: fix accidental removal of a trailing space in signature line	2008-04-21 23:36:56 -07:00
git-gui	Merge git://repo.or.cz/git-gui	2008-04-04 22:38:32 -07:00
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2008-04-07 21:52:23 -07:00
gitweb	Escape project names before creating pathinfo URLs	2008-04-21 23:30:55 -07:00
mozilla-sha1	…
perl	…
ppc	…
t	Revert "filter-branch: subdirectory filter needs --full-history"	2008-05-27 22:27:30 -07:00
templates	…
xdiff	…
.gitattributes	…
.gitignore	…
.mailmap	…
COPYING	…
GIT-VERSION-GEN	GIT 1.5.5	2008-04-07 21:57:43 -07:00
INSTALL	…
Makefile	Merge branch 'jc/makefile'	2008-03-17 00:52:19 -07:00
README	…
RelNotes	Release Notes for 1.5.5.2	2008-05-25 21:11:24 -07:00
alias.c	…
alloc.c	…
archive-tar.c	git-archive: ignore prefix when checking file attribute	2008-04-10 00:20:38 -07:00
archive-zip.c	git-archive: ignore prefix when checking file attribute	2008-04-10 00:20:38 -07:00
archive.c	archive.c: format_subst - fixed bogus argument to memchr	2008-04-22 21:23:16 -07:00
archive.h	…
attr.c	gitattributes: Fix subdirectory attributes specified from root directory	2008-04-22 21:12:37 -07:00
attr.h	…
base85.c	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin-add.c	Revert part of `1abf095` (git-add: adjust to the get_pathspec() changes)	2008-03-07 00:14:43 -08:00
builtin-annotate.c	…
builtin-apply.c	Merge branch 'maint-1.5.4' into maint	2008-04-16 00:37:33 -07:00
builtin-archive.c	…
builtin-blame.c	…
builtin-branch.c	…
builtin-bundle.c	Always set *nongit_ok in setup_git_directory_gently()	2008-03-26 15:41:35 -07:00
builtin-cat-file.c	…
builtin-check-attr.c	…
builtin-check-ref-format.c	…
builtin-checkout-index.c	…
builtin-checkout.c	checkout: don't rfc2047-encode oneline on detached HEAD	2008-05-03 18:47:18 -07:00
builtin-clean.c	git clean: Don't automatically remove directories when run within subdirectory	2008-04-14 23:14:58 -07:00
builtin-commit-tree.c	…
builtin-commit.c	Merge branch 'maint-1.5.4' into maint	2008-05-11 12:09:12 -07:00
builtin-config.c	Always set *nongit_ok in setup_git_directory_gently()	2008-03-26 15:41:35 -07:00
builtin-count-objects.c	…
builtin-describe.c	Merge branch 'jc/describe-always'	2008-03-08 20:10:09 -08:00
builtin-diff-files.c	Always set *nongit_ok in setup_git_directory_gently()	2008-03-26 15:41:35 -07:00
builtin-diff-index.c	…
builtin-diff-tree.c	…
builtin-diff.c	Always set *nongit_ok in setup_git_directory_gently()	2008-03-26 15:41:35 -07:00
builtin-fast-export.c	Merge branch 'maint-1.5.4' into maint	2008-05-25 22:34:05 -07:00
builtin-fetch--tool.c	…
builtin-fetch-pack.c	fetch-pack: brown paper bag fix	2008-04-30 11:42:05 -07:00
builtin-fetch.c	Fix use after free() in builtin-fetch	2008-04-28 23:57:47 -07:00
builtin-fmt-merge-msg.c	Merge branch 'maint-1.5.4' into maint	2008-04-16 00:37:33 -07:00
builtin-for-each-ref.c	…
builtin-fsck.c	…
builtin-gc.c	gc --auto: raise default auto pack limit from 20 to 50	2008-03-23 00:11:31 -07:00
builtin-grep.c	add NO_EXTERNAL_GREP build option	2008-03-13 00:57:53 -07:00
builtin-http-fetch.c	…
builtin-init-db.c	init: show "Reinit" message even in an (existing) empty repository	2008-03-25 00:34:05 -07:00
builtin-log.c	Merge branch 'maint'	2008-03-15 00:09:33 -07:00
builtin-ls-files.c	Revert part of `d089eba` (setup: sanitize absolute and funny paths in get_pathspec())	2008-03-07 00:14:43 -08:00
builtin-ls-remote.c	Always set *nongit_ok in setup_git_directory_gently()	2008-03-26 15:41:35 -07:00
builtin-ls-tree.c	…
builtin-mailinfo.c	…
builtin-mailsplit.c	…
builtin-merge-base.c	…
builtin-merge-file.c	Merge branch 'maint'	2008-03-14 00:16:42 -07:00
builtin-merge-ours.c	…
builtin-merge-recursive.c	Merge branch 'maint'	2008-03-14 00:16:42 -07:00
builtin-mv.c	Revert part of `744dacd` (builtin-mv: minimum fix to avoid losing files)	2008-03-07 00:14:43 -08:00
builtin-name-rev.c	…
builtin-pack-objects.c	pack-objects: proper pack time stamping with --max-pack-size	2008-03-13 22:51:30 -07:00
builtin-pack-refs.c	…
builtin-prune-packed.c	…
builtin-prune.c	builtin-prune: protect objects listed on the command line	2008-03-27 15:39:57 -07:00
builtin-push.c	…
builtin-read-tree.c	read-tree() and unpack_trees(): use consistent limit	2008-03-13 23:56:36 -07:00
builtin-reflog.c	…
builtin-remote.c	remote: create fetch config lines with '+'	2008-04-24 22:30:31 -07:00
builtin-rerere.c	…
builtin-reset.c	Make builtin-reset.c use parse_options.	2008-03-05 12:16:27 -08:00
builtin-rev-list.c	Add --reverse to the git-rev-list usage string	2008-03-19 17:31:51 -07:00
builtin-rev-parse.c	Merge branch 'maint-1.5.4' into maint	2008-05-23 15:52:43 -07:00
builtin-revert.c	…
builtin-rm.c	…
builtin-send-pack.c	Tighten refspec processing	2008-03-26 00:10:55 -07:00
builtin-shortlog.c	Merge branch 'maint-1.5.4' into maint	2008-04-12 15:41:19 -07:00
builtin-show-branch.c	show-branch --current: do not barf on detached HEAD	2008-05-26 15:09:56 -07:00
builtin-show-ref.c	…
builtin-stripspace.c	…
builtin-symbolic-ref.c	…
builtin-tag.c	Merge branch 'maint-1.5.4' into maint	2008-04-10 00:29:33 -07:00
builtin-tar-tree.c	…
builtin-unpack-objects.c	Revert "unpack-objects: prevent writing of inconsistent objects"	2008-03-04 03:11:30 -08:00
builtin-update-index.c	…
builtin-update-ref.c	…
builtin-upload-archive.c	…
builtin-verify-pack.c	…
builtin-verify-tag.c	verify-tag: Clean up the temporary file if gpg cannot be started.	2008-04-02 00:08:30 -07:00
builtin-write-tree.c	…
builtin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	Merge branch 'maint-1.5.4' into maint	2008-04-24 21:50:48 -07:00
cache-tree.h	…
cache.h	Merge branch 'lt/unpack-trees'	2008-03-11 22:13:44 -07:00
check-builtins.sh	…
check-racy.c	…
color.c	…
color.h	…
combine-diff.c	…
command-list.txt	…
commit.c	…
commit.h	Merge branch 'maint'	2008-03-15 00:09:33 -07:00
config.c	…
config.mak.in	autoconf: Test FREAD_READS_DIRECTORIES	2008-03-11 02:10:43 -07:00
configure.ac	autoconf: Test FREAD_READS_DIRECTORIES	2008-03-11 02:10:43 -07:00
connect.c	…
convert.c	…
copy.c	copy.c: copy_fd - correctly report write errors	2008-04-22 21:21:08 -07:00
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	diff-files: careful when inspecting work tree items	2008-03-30 22:22:09 -07:00
diff.c	Write diff output to a file in struct diff_options	2008-03-14 00:42:14 -07:00
diff.h	Write diff output to a file in struct diff_options	2008-03-14 00:42:14 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	git clean: Don't automatically remove directories when run within subdirectory	2008-04-14 23:14:58 -07:00
dir.h	…
dump-cache-tree.c	…
entry.c	Fix possible Solaris problem in 'checkout_entry()'	2008-03-18 22:18:57 -07:00
environment.c	…
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	fast-import: Allow "reset" to delete a new branch without error	2008-03-16 14:24:32 -07:00
fetch-pack.h	Teach fetch-pack/upload-pack about --include-tag	2008-03-04 23:28:14 -08:00
fixup-builtins	…
fsck.c	fsck.c: fix bogus "empty tree" check	2008-03-05 10:32:01 -08:00
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	…
git-am.sh	Merge branch 'maint-1.5.4' into maint	2008-05-21 14:27:59 -07:00
git-archimport.perl	…
git-bisect.sh	bisect: print an error message when "git rev-list --bisect-vars" fails	2008-05-08 17:50:00 -07:00
git-clone.sh	Use "=" instead of "==" in condition as it is more portable	2008-04-28 15:03:28 -07:00
git-compat-util.h	pack-objects: proper pack time stamping with --max-pack-size	2008-03-13 22:51:30 -07:00
git-cvsexportcommit.perl	Merge branch 'js/maint-cvsexport' into maint	2008-03-08 02:13:52 -08:00
git-cvsimport.perl	Merge branch 'maint-1.5.4' into maint	2008-04-29 22:55:07 -07:00
git-cvsserver.perl	Merge branch 'pb/cvsserver'	2008-04-02 00:22:20 -07:00
git-filter-branch.sh	Revert "filter-branch: subdirectory filter needs --full-history"	2008-05-27 22:27:30 -07:00
git-instaweb.sh	…
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	git-merge-one-file: fix longstanding stupid thinko	2008-03-18 22:17:17 -07:00
git-merge-resolve.sh	…
git-merge-stupid.sh	…
git-merge.sh	specify explicit "--pretty=medium" with `git log/show/whatchanged`	2008-03-05 12:06:09 -08:00
git-mergetool.sh	Teach git mergetool to use custom commands defined at config time	2008-03-05 12:07:04 -08:00
git-parse-remote.sh	…
git-pull.sh	…
git-quiltimport.sh	quiltimport: fix misquoting of parsed -p<num> parameter	2008-03-12 21:07:19 -07:00
git-rebase--interactive.sh	remove use of "tail -n 1" and "tail -1"	2008-03-13 00:57:52 -07:00
git-rebase.sh	Merge branch 'maint'	2008-03-16 01:03:16 -07:00
git-relink.perl	…
git-repack.sh	git-repack: re-enable parsing of -n command line option	2008-05-11 10:03:58 -07:00
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jk/maint-send-email-compose' into maint	2008-05-25 22:34:23 -07:00
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	git-submodule - possibly use branch name to describe a module	2008-04-14 23:14:08 -07:00
git-svn.perl	Merge branch 'maint-1.5.4' into maint	2008-04-22 23:37:06 -07:00
git-web--browse.sh	web--browse: use custom commands defined at config time	2008-03-14 00:31:06 -07:00
git.c	Accept git aliases outside a git repository	2008-04-01 23:40:02 -07:00
git.spec.in	…
grep.c	…
grep.h	…
hash-object.c	…
hash.c	Add 'const' where appropriate to index handling functions	2008-03-09 00:43:48 -08:00
hash.h	Add 'const' where appropriate to index handling functions	2008-03-09 00:43:48 -08:00
help.c	help: Add a missing OPT_END().	2008-04-01 23:40:06 -07:00
http-push.c	Merge branch 'mh/maint-http-proxy-fix' into maint	2008-03-08 02:20:37 -08:00
http-walker.c	…
http.c	Merge branch 'mh/maint-http-proxy-fix' into maint	2008-03-08 02:20:37 -08:00
http.h	…
ident.c	ident.c: reword error message when the user name cannot be determined	2008-03-08 19:43:21 -08:00
imap-send.c	Don't force imap.host to be set when imap.tunnel is set	2008-04-22 21:42:23 -07:00
index-pack.c	…
interpolate.c	…
interpolate.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	Merge branch 'maint'	2008-03-15 00:09:33 -07:00
log-tree.h	Merge branch 'maint'	2008-03-15 00:09:33 -07:00
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-index.c	…
merge-recursive.h	…
merge-tree.c	Make 'traverse_trees()' traverse conflicting DF entries in parallel	2008-03-09 00:43:47 -08:00
mktag.c	mktag.c: tweak validation of tagger field and adjust test script	2008-03-31 22:43:34 -07:00
mktree.c	…
object.c	…
object.h	…
pack-check.c	…
pack-redundant.c	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options.c	Merge branch 'maint-1.5.4' into maint	2008-04-10 00:29:33 -07:00
parse-options.h	parse-options.c: introduce OPT_DATE	2008-03-27 13:55:15 -07:00
patch-delta.c	…
patch-id.c	…
patch-ids.c	…
patch-ids.h	…
path-list.c	…
path-list.h	…
path.c	Do not use GUID on dir in git init --shared=all on FreeBSD	2008-03-05 12:22:26 -08:00
pkt-line.c	…
pkt-line.h	…
pretty.c	Merge branch 'maint'	2008-03-15 00:09:33 -07:00
progress.c	…
progress.h	…
quote.c	Merge branch 'dp/clean-fix'	2008-03-08 21:29:56 -08:00
quote.h	Make private quote_path() in wt-status.c available as quote_path_relative()	2008-03-07 21:22:25 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Add 'const' where appropriate to index handling functions	2008-03-09 00:43:48 -08:00
receive-pack.c	Revert "receive-pack: use strict mode for unpacking objects"	2008-03-04 03:11:06 -08:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
remote.c	push: allow unqualified dest refspecs to DWIM	2008-04-24 22:13:24 -07:00
remote.h	git-remote: reject adding remotes with invalid names	2008-04-18 16:31:27 -07:00
revision.c	Merge branch 'maint-1.5.4' into maint	2008-04-11 23:55:55 -07:00
revision.h	…
run-command.c	run-command: Redirect stderr to a pipe before redirecting stdout to stderr	2008-03-05 12:18:03 -08:00
run-command.h	…
send-pack.h	…
server-info.c	…
setup.c	Always set *nongit_ok in setup_git_directory_gently()	2008-03-26 15:41:35 -07:00
sha1_file.c	…
sha1_name.c	Merge branch 'maint-1.5.4' into maint	2008-04-29 22:55:07 -07:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
strbuf.c	…
strbuf.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
test-absolute-path.c	…
test-chmtime.c	…
test-date.c	…
test-delta.c	…
test-genrandom.c	…
test-match-trees.c	…
test-parse-options.c	…
test-sha1.c	…
test-sha1.sh	more tr portability test script fixes	2008-03-13 00:57:52 -07:00
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport.c	Teach git-fetch to exploit server side automatic tag following	2008-03-04 23:28:15 -08:00
transport.h	Teach git-fetch to exploit server side automatic tag following	2008-03-04 23:28:15 -08:00
tree-diff.c	…
tree-walk.c	Fix tree-walking compare_entry() in the presense of --prefix	2008-03-09 00:43:47 -08:00
tree-walk.h	Make 'traverse_trees()' traverse conflicting DF entries in parallel	2008-03-09 00:43:47 -08:00
tree.c	…
tree.h	…
unpack-file.c	…
unpack-trees.c	Fix read-tree not to discard errors	2008-03-18 22:17:22 -07:00
unpack-trees.h	read-tree() and unpack_trees(): use consistent limit	2008-03-13 23:56:36 -07:00
update-server-info.c	…
upload-pack.c	Teach fetch-pack/upload-pack about --include-tag	2008-03-04 23:28:14 -08:00
usage.c	…
utf8.c	…
utf8.h	…
var.c	…
walker.c	…
walker.h	…
write_or_die.c	…
ws.c	…
wt-status.c	wt-status.c: no need for dup() dance anymore	2008-03-14 00:42:14 -07:00
wt-status.h	wt-status.h: declare global variables as extern	2008-05-11 10:04:46 -07:00
xdiff-interface.c	Merge branch 'maint'	2008-03-14 00:16:42 -07:00
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.