kernel/git - git - PowerEL Git System

Go to file

Brad King 80988783c8 submodule: Search for merges only at end of recursive merge The submodule merge search is not useful during virtual merges because the results cannot be used automatically. Furthermore any suggestions made by the search may apply to commits different than HEAD:sub and MERGE_HEAD:sub, thus confusing the user. Skip searching for submodule merges during a virtual merge such as that between B and C while merging the heads of: B---BC / \ / A X \ / \ C---CB Run the search only when the recursion level is zero (!o->call_depth). This fixes known breakage tested in t7405-submodule-merge. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-10-13 10:18:16 -07:00
Documentation	Update draft release notes to 1.7.8	2011-10-12 12:42:44 -07:00
block-sha1	…
builtin	Merge branch 'jc/parse-options-boolean'	2011-10-12 12:34:15 -07:00
compat	obstack.c: Fix some sparse warnings	2011-09-11 14:43:33 -07:00
contrib	Merge branch 'mm/mediawiki-as-a-remote'	2011-10-05 12:36:27 -07:00
git-gui	…
git_remote_helpers	Change check_ref_format() to take a flags argument	2011-10-05 13:45:29 -07:00
gitk-git	…
gitweb	Merge branch 'ps/gitweb-js-with-lineno'	2011-10-10 15:56:20 -07:00
mergetools	mergetools/meld: Use '--output' when available	2011-08-19 10:52:16 -07:00
perl	Add Git::config_path()	2011-09-30 12:34:38 -07:00
po	…
ppc	…
t	submodule: Search for merges only at end of recursive merge	2011-10-13 10:18:16 -07:00
templates	templates/hooks--*: remove sample hooks without any functionality	2011-09-27 10:00:35 -07:00
vcs-svn	…
xdiff	Merge branch 'rc/histogram-diff'	2011-09-06 11:42:58 -07:00
.gitattributes	…
.gitignore	Revert clock-skew based attempt to optimize tag --contains traversal	2011-07-14 11:02:06 -07:00
.mailmap	…
COPYING	…
GIT-VERSION-GEN	Post 1.7.7 first wave	2011-10-05 12:54:35 -07:00
INSTALL	Add explanation of the profile feedback build to the README	2011-06-20 16:31:44 -07:00
LGPL-2.1	…
Makefile	Makefile: fix permissions of mergetools/ checked out with permissive umask	2011-10-09 12:59:47 -07:00
README	…
RelNotes	Post 1.7.7 first wave	2011-10-05 12:54:35 -07:00
abspath.c	Merge branch 'js/maint-add-path-stat-pwd' into maint	2011-08-16 11:41:27 -07:00
aclocal.m4	…
advice.c	advice: Introduce error_resolve_conflict	2011-08-04 15:40:41 -07:00
advice.h	advice: Introduce error_resolve_conflict	2011-08-04 15:40:41 -07:00
alias.c	…
alloc.c	…
archive-tar.c	upload-archive: allow user to turn off filters	2011-06-22 11:12:35 -07:00
archive-zip.c	Merge branch 'jk/archive-tar-filter'	2011-07-19 09:45:32 -07:00
archive.c	archive.c: use OPT_BOOL()	2011-09-27 17:00:06 -07:00
archive.h	upload-archive: allow user to turn off filters	2011-06-22 11:12:35 -07:00
argv-array.c	refactor argv_array into generic code	2011-09-14 11:56:36 -07:00
argv-array.h	refactor argv_array into generic code	2011-09-14 11:56:36 -07:00
attr.c	Merge branch 'mh/attr'	2011-08-28 21:19:12 -07:00
attr.h	Rename git_checkattr() to git_check_attr()	2011-08-04 15:53:21 -07:00
base85.c	…
bisect.c	Merge branch 'jk/argv-array'	2011-10-05 12:36:24 -07:00
bisect.h	bisect: introduce support for --no-checkout option.	2011-08-04 15:34:32 -07:00
blob.c	…
blob.h	…
branch.c	Merge branch 'rr/revert-cherry-pick-continue'	2011-10-05 12:36:19 -07:00
branch.h	branch --set-upstream: regression fix	2011-09-16 21:47:47 -07:00
builtin.h	Revert clock-skew based attempt to optimize tag --contains traversal	2011-07-14 11:02:06 -07:00
bundle.c	Teach progress eye-candy to fetch_refs_from_bundle()	2011-09-19 11:07:21 -07:00
bundle.h	Teach progress eye-candy to fetch_refs_from_bundle()	2011-09-19 11:07:21 -07:00
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'mh/check-ref-format-3'	2011-10-10 15:56:18 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	want_color: automatically fallback to color.ui	2011-08-19 15:51:38 -07:00
color.h	want_color: automatically fallback to color.ui	2011-08-19 15:51:38 -07:00
combine-diff.c	Merge branch 'jk/color-and-pager'	2011-08-28 21:19:16 -07:00
command-list.txt	…
commit.c	Merge branch 'nd/decorate-grafts'	2011-08-28 21:22:58 -07:00
commit.h	Move write_shallow_commits to fetch-pack.c	2011-08-18 11:01:18 -07:00
config.c	Merge branch 'rr/revert-cherry-pick-continue'	2011-10-05 12:36:19 -07:00
config.mak.in	…
configure.ac	…
connect.c	Change check_ref_format() to take a flags argument	2011-10-05 13:45:29 -07:00
connected.c	check_everything_connected(): libify	2011-09-09 15:19:02 -07:00
connected.h	check_everything_connected(): libify	2011-09-09 15:19:02 -07:00
convert.c	Merge branch 'tr/maint-ident-to-git-memmove'	2011-09-02 13:18:25 -07:00
convert.h	…
copy.c	…
csum-file.c	Merge branch 'jc/index-pack'	2011-07-19 09:54:51 -07:00
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	date.c: Support iso8601 timezone formats	2011-09-12 16:49:14 -07:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'cn/eradicate-working-copy'	2011-10-05 12:36:26 -07:00
diff-no-index.c	…
diff.c	Merge branch 'jc/maint-diffstat-numstat-context'	2011-10-10 15:56:18 -07:00
diff.h	Merge branch 'jk/color-and-pager'	2011-08-28 21:19:16 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	Use kwset in pickaxe	2011-08-20 22:33:57 -07:00
diffcore-rename.c	…
diffcore.h	combine-diff: support format_callback	2011-08-20 23:03:06 -07:00
dir.c	rename pathspec_prefix() to common_prefix() and move to dir.[ch]	2011-09-12 14:38:32 -07:00
dir.h	rename pathspec_prefix() to common_prefix() and move to dir.[ch]	2011-09-12 14:38:32 -07:00
editor.c	…
entry.c	…
environment.c	Change check_ref_format() to take a flags argument	2011-10-05 13:45:29 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Change check_ref_format() to take a flags argument	2011-10-05 13:45:29 -07:00
fetch-pack.h	…
fixup-builtins	…
fsck.c	fsck: improve committer/author check	2011-08-11 12:21:07 -07:00
fsck.h	…
generate-cmdlist.sh	misc-sh: fix up whitespace in some other .sh files.	2011-08-05 15:04:48 -07:00
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-am.sh	Merge branch 'gb/am-hg-patch'	2011-10-05 12:36:17 -07:00
git-archimport.perl	…
git-bisect.sh	bisect: take advantage of gettextln, eval_gettextln.	2011-08-30 16:19:57 -07:00
git-compat-util.h	Merge branch 'cb/maint-exec-error-report'	2011-08-17 17:25:55 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	use -h for synopsis and --help for manpage consistently	2011-10-05 10:47:10 -07:00
git-difftool--helper.sh	difftool--helper: Make style consistent with git	2011-08-19 00:09:17 -07:00
git-difftool.perl	use -h for synopsis and --help for manpage consistently	2011-10-05 10:47:10 -07:00
git-filter-branch.sh	Merge branch 'jk/filter-branch-require-clean-work-tree'	2011-10-05 12:35:55 -07:00
git-instaweb.sh	git-instaweb: Check that correct config file exists for (re)start	2011-06-27 09:11:41 +00:00
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	Merge branch 'maint'	2011-09-19 20:46:48 -07:00
git-mergetool.sh	Merge branch 'jm/mergetool-pathspec'	2011-10-10 15:56:18 -07:00
git-parse-remote.sh	…
git-pull.sh	use -h for synopsis and --help for manpage consistently	2011-10-05 10:47:10 -07:00
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree	2011-08-26 15:25:41 -07:00
git-rebase--merge.sh	…
git-rebase.sh	misc-sh: fix up whitespace in some other .sh files.	2011-08-05 15:04:48 -07:00
git-relink.perl	…
git-remote-testgit.py	(short) documentation for the testgit remote helper	2011-09-01 15:52:02 -07:00
git-repack.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'cs/perl-config-path-send-email'	2011-10-12 12:34:05 -07:00
git-sh-i18n.sh	gettext: add gettextln, eval_gettextln to encode common idiom	2011-08-08 12:02:16 -07:00
git-sh-setup.sh	use -h for synopsis and --help for manpage consistently	2011-10-05 10:47:10 -07:00
git-stash.sh	Merge branch 'bc/unstash-clean-crufts'	2011-10-05 12:36:17 -07:00
git-submodule.sh	Merge branch 'fg/submodule-git-file-git-dir'	2011-10-10 15:56:17 -07:00
git-svn.perl	use -h for synopsis and --help for manpage consistently	2011-10-05 10:47:10 -07:00
git-web--browse.sh	…
git.c	Merge branch 'jk/pager-with-external-command'	2011-08-28 21:19:25 -07:00
git.spec.in	…
graph.c	color: delay auto-color decision until point of use	2011-08-19 15:51:34 -07:00
graph.h	…
grep.c	Merge branch 'fk/use-kwset-pickaxe-grep-f'	2011-09-02 10:00:38 -07:00
grep.h	Use kwset in grep	2011-08-20 22:33:58 -07:00
hash.c	…
hash.h	…
help.c	Merge branch 'ms/help-unknown'	2011-07-22 14:43:21 -07:00
help.h	…
hex.c	get_sha1_hex(): do not read past a NUL character	2011-10-05 13:45:16 -07:00
http-backend.c	…
http-fetch.c	Mark http-fetch without -a as deprecated	2011-08-23 21:36:20 -07:00
http-push.c	whitespace: have SP on both sides of an assignment "="	2011-08-25 14:47:07 -07:00
http-walker.c	…
http.c	Merge branch 'jn/maint-http-error-message'	2011-10-10 15:56:17 -07:00
http.h	Merge branch 'jc/zlib-wrap' into maint	2011-08-16 11:23:26 -07:00
ident.c	…
imap-send.c	…
kwset.c	sparse: Fix an "Using plain integer as NULL pointer" warning	2011-09-11 14:43:14 -07:00
kwset.h	Adapt the kwset code to Git	2011-08-20 22:33:57 -07:00
levenshtein.c	…
levenshtein.h	…
list-objects.c	list-objects: pass callback data to show_objects()	2011-09-01 15:46:12 -07:00
list-objects.h	list-objects: pass callback data to show_objects()	2011-09-01 15:46:12 -07:00
ll-merge.c	Rename git_checkattr() to git_check_attr()	2011-08-04 15:53:21 -07:00
ll-merge.h	…
lockfile.c	…
log-tree.c	Merge branch 'nd/decorate-grafts'	2011-08-28 21:22:58 -07:00
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-file.c	…
merge-file.h	…
merge-recursive.c	submodule: Search for merges only at end of recursive merge	2011-10-13 10:18:16 -07:00
merge-recursive.h	merge-recursive: Save D/F conflict filenames instead of unlinking them	2011-08-14 14:19:35 -07:00
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'mh/maint-notes-merge-pathbuf-fix'	2011-10-10 15:56:20 -07:00
notes-merge.h	…
notes.c	Do not use C++-style comments	2011-08-22 10:07:07 -07:00
notes.h	…
object.c	…
object.h	…
pack-check.c	…
pack-refs.c	Change check_ref_format() to take a flags argument	2011-10-05 13:45:29 -07:00
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	setup_pager: set GIT_PAGER_IN_USE	2011-08-18 14:17:12 -07:00
parse-options-cb.c	parseopt: add OPT_NOOP_NOARG	2011-09-28 12:46:21 -07:00
parse-options.c	parse-options: deprecate OPT_BOOLEAN	2011-09-27 17:00:04 -07:00
parse-options.h	parseopt: add OPT_NOOP_NOARG	2011-09-28 12:46:21 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	read_gitfile_gently(): rename misnamed function to read_gitfile()	2011-08-22 14:04:56 -07:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	…
progress.c	…
progress.h	…
quote.c	Merge branch 'jk/argv-array'	2011-10-05 12:36:24 -07:00
quote.h	quote: provide sq_dequote_to_argv_array	2011-09-14 11:56:49 -07:00
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'maint'	2011-08-25 16:00:07 -07:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'jp/get-ref-dir-unsorted'	2011-10-10 15:56:19 -07:00
refs.h	Merge branch 'jp/get-ref-dir-unsorted'	2011-10-10 15:56:19 -07:00
remote-curl.c	Merge branch 'sp/smart-http-failure'	2011-10-12 12:34:27 -07:00
remote.c	remote: use xstrdup() instead of strdup()	2011-10-05 13:45:31 -07:00
remote.h	…
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jc/fetch-verify'	2011-10-05 12:36:20 -07:00
revision.h	Merge branch 'jc/fetch-verify'	2011-10-05 12:36:20 -07:00
run-command.c	Merge branch 'jk/argv-array'	2011-10-05 12:36:24 -07:00
run-command.h	…
send-pack.h	…
sequencer.c	revert: Introduce --reset to remove sequencer state	2011-08-04 15:41:21 -07:00
sequencer.h	revert: Introduce --reset to remove sequencer state	2011-08-04 15:41:21 -07:00
server-info.c	…
setup.c	Merge branch 'cb/common-prefix-unification'	2011-10-10 15:56:17 -07:00
sh-i18n--envsubst.c	Merge branch 'js/i18n-windows'	2011-06-29 17:03:13 -07:00
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'wh/normalize-alt-odb-path'	2011-10-05 12:36:22 -07:00
sha1_name.c	Merge branch 'mh/check-ref-format-3'	2011-10-10 15:56:18 -07:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	Merge branch 'jk/maint-config-param' into maint	2011-09-11 21:53:13 -07:00
strbuf.h	Merge branch 'jk/maint-config-param' into maint	2011-09-11 21:53:13 -07:00
streaming.c	Merge branch 'jc/streaming-filter'	2011-08-01 15:00:29 -07:00
streaming.h	…
string-list.c	string-list: Add API to remove an item from an unsorted list	2011-08-14 14:19:35 -07:00
string-list.h	string-list: Add API to remove an item from an unsorted list	2011-08-14 14:19:35 -07:00
submodule.c	submodule: Search for merges only at end of recursive merge	2011-10-13 10:18:16 -07:00
submodule.h	submodule: Search for merges only at end of recursive merge	2011-10-13 10:18:16 -07:00
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	…
test-ctype.c	test-ctype: add test for is_pathspec_magic	2011-10-03 11:44:03 -07:00
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	parseopt: add OPT_NOOP_NOARG	2011-09-28 12:46:21 -07:00
test-path-utils.c	test-path-utils: Add subcommand "prefix_path"	2011-08-04 15:57:18 -07:00
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	remote: avoid passing NULL to read_ref()	2011-10-05 13:45:31 -07:00
transport.c	Merge branch 'mh/check-ref-format-3'	2011-10-10 15:56:18 -07:00
transport.h	push: Don't push a repository with unpushed submodules	2011-08-20 23:03:52 -07:00
tree-diff.c	…
tree-walk.c	Merge branch 'dm/tree-walk'	2011-10-10 15:56:20 -07:00
tree-walk.h	traverse_trees(): allow pruning with pathspec	2011-08-29 14:32:04 -07:00
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-trees.c	Merge branch 'mg/maint-doc-sparse-checkout'	2011-10-05 12:36:25 -07:00
unpack-trees.h	Merge branch 'jc/diff-index-unpack'	2011-10-05 12:35:53 -07:00
upload-pack.c	Merge branch 'jc/fetch-verify'	2011-10-05 12:36:20 -07:00
url.c	…
url.h	…
usage.c	error_routine: use parent's stderr if exec fails	2011-07-31 18:27:07 -07:00
userdiff.c	Merge branch 'jk/combine-diff-binary-etc' into maint	2011-08-16 11:23:24 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
walker.c	Change check_ref_format() to take a flags argument	2011-10-05 13:45:29 -07:00
walker.h	…
wrap-for-bin.sh	…
wrapper.c	…
write_or_die.c	…
ws.c	Rename git_checkattr() to git_check_attr()	2011-08-04 15:53:21 -07:00
wt-status.c	Merge branch 'jk/maint-1.7.2-status-ignored' into maint	2011-09-11 21:51:10 -07:00
wt-status.h	…
xdiff-interface.c	…
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.