kernel/git - git - PowerEL Git System

Go to file

Jens Lehmann 95c16418f0 rm: delete .gitmodules entry of submodules removed from the work tree Currently using "git rm" on a submodule removes the submodule's work tree from that of the superproject and the gitlink from the index. But the submodule's section in .gitmodules is left untouched, which is a leftover of the now removed submodule and might irritate users (as opposed to the setting in .git/config, this must stay as a reminder that the user showed interest in this submodule so it will be repopulated later when an older commit is checked out). Let "git rm" help the user by not only removing the submodule from the work tree but by also removing the "submodule.<submodule name>" section from the .gitmodules file and stage both. This doesn't happen when the "--cached" option is used, as it would modify the work tree. This also silently does nothing when no .gitmodules file is found and only issues a warning when it doesn't have a section for this submodule. This is because the user might just use plain gitlinks without the .gitmodules file or has already removed the section by hand before issuing the "git rm" command (in which case the warning reminds him that rm would have done that for him). Only when .gitmodules is found and contains merge conflicts the rm command will fail and tell the user to resolve the conflict before trying again. Also extend the man page to inform the user about this new feature. While at it promote the submodule sub-section to a chapter as it made not much sense under "REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM". In t7610 three uses of "git rm submod" had to be replaced with "git rm --cached submod" because that test expects .gitmodules and the work tree to stay untouched. Also in t7400 the tests for the remaining settings in the .gitmodules file had to be changed to assert that these settings are missing. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2013-08-06 14:11:00 -07:00
Documentation	rm: delete .gitmodules entry of submodules removed from the work tree	2013-08-06 14:11:00 -07:00
block-sha1	…
builtin	rm: delete .gitmodules entry of submodules removed from the work tree	2013-08-06 14:11:00 -07:00
compat	Merge branch 'fc/macos-x-clipped-write' into maint	2013-06-30 15:33:40 -07:00
contrib	Merge branch 'jk/bash-completion'	2013-07-11 13:05:28 -07:00
git-gui	git-gui 0.18.0	2013-06-16 20:06:55 -07:00
git_remote_helpers	…
gitk-git	Merge git://ozlabs.org/~paulus/gitk	2013-05-17 11:55:02 -07:00
gitweb	gitweb: allow extra breadcrumbs to prefix the trail	2013-07-04 21:52:15 -07:00
mergetools	Sync with v1.8.2.3	2013-05-09 13:32:54 -07:00
perl	git-svn: added an --include-path flag	2013-05-09 01:13:36 +00:00
po	gitk: Update Swedish translation (304t)	2013-05-17 09:25:25 +10:00
ppc	…
t	rm: delete .gitmodules entry of submodules removed from the work tree	2013-08-06 14:11:00 -07:00
templates	pre-push.sample: Make the script executable	2013-06-11 11:22:00 -07:00
vcs-svn	…
xdiff	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
.gitattributes	…
.gitignore	Merge branch 'jc/topo-author-date-sort'	2013-07-01 12:41:23 -07:00
.mailmap	.mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"	2013-06-25 15:18:43 -07:00
COPYING	…
GIT-VERSION-GEN	Git 1.8.3.2	2013-06-28 14:56:30 -07:00
INSTALL	Typo fix: replacing it's -> its	2013-04-11 17:39:05 -07:00
LGPL-2.1	…
Makefile	Merge branch 'maint'	2013-07-05 01:16:27 -07:00
README	…
RelNotes	Start preparing for 1.8.3.3	2013-06-30 15:36:03 -07:00
abspath.c	mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE	2013-05-08 12:14:35 -07:00
aclocal.m4	…
advice.c	Merge branch 'mm/rm-coalesce-errors'	2013-06-24 13:48:35 -07:00
advice.h	Merge branch 'mm/rm-coalesce-errors'	2013-06-24 13:48:35 -07:00
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	Merge branch 'sb/archive-zip-double-assignment-fix'	2013-06-06 12:19:04 -07:00
archive.c	archive: convert to use parse_pathspec	2013-07-15 10:56:07 -07:00
archive.h	archive: convert to use parse_pathspec	2013-07-15 10:56:07 -07:00
argv-array.c	…
argv-array.h	…
attr.c	Merge branch 'lf/read-blob-data-from-index'	2013-04-21 18:39:45 -07:00
attr.h	…
base85.c	…
bisect.c	register_ref(): make a copy of the bad reference SHA-1	2013-06-02 15:28:47 -07:00
bisect.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'jh/checkout-auto-tracking' into maint	2013-06-27 14:37:21 -07:00
branch.h	…
builtin.h	Merge branch 'jh/libify-note-handling'	2013-06-24 13:48:30 -07:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	object_array_entry: fix memory handling of the name field	2013-06-02 15:28:46 -07:00
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	make color.ui default to 'auto'	2013-06-10 10:55:42 -07:00
color.h	…
column.c	…
column.h	…
combine-diff.c	remove diff_tree_{setup,release}_paths	2013-07-15 10:56:09 -07:00
command-list.txt	…
commit-slab.h	commit-slab: introduce a macro to define a slab for new type	2013-06-07 10:02:12 -07:00
commit.c	Merge branch 'jc/topo-author-date-sort'	2013-07-01 12:41:23 -07:00
commit.h	convert run_add_interactive to use struct pathspec	2013-07-15 10:56:08 -07:00
config.c	Merge branch 'jc/core-checkstat' into maint	2013-07-03 15:39:15 -07:00
config.mak.in	Merge branch 'jc/remove-export-from-config-mak-in'	2013-04-01 09:00:02 -07:00
config.mak.uname	Merge branch 'fc/macos-x-clipped-write' into maint	2013-06-30 15:33:40 -07:00
configure.ac	configure: fix option help message for --disable-pthreads	2013-06-28 10:49:26 -07:00
connect.c	Merge branch 'nd/clone-local-with-colon'	2013-06-02 15:52:22 -07:00
connected.c	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
connected.h	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
convert.c	Merge branch 'lf/read-blob-data-from-index'	2013-04-21 18:39:45 -07:00
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	sparse: Fix mingw_main() argument number/type errors	2013-04-28 12:32:08 -07:00
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	Merge branch 'jk/pkt-line-cleanup'	2013-04-01 08:59:37 -07:00
date.c	Merge branch 'jc/prune-all'	2013-05-29 14:23:04 -07:00
decorate.c	decorate.c: compact table when growing	2013-05-16 11:51:08 -07:00
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	remove init_pathspec() in favor of parse_pathspec()	2013-07-15 10:56:09 -07:00
diff-no-index.c	mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE	2013-05-08 12:14:35 -07:00
diff.c	Merge branch 'jc/maint-diff-core-safecrlf'	2013-07-11 13:05:45 -07:00
diff.h	remove diff_tree_{setup,release}_paths	2013-07-15 10:56:09 -07:00
diffcore-break.c	diffcore-break: don't divide by zero	2013-04-03 12:48:02 -07:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	Merge branch 'rs/pickaxe-simplify'	2013-07-12 12:04:17 -07:00
diffcore-rename.c	Preallocate hash tables when the number of inserts are known in advance	2013-03-16 22:57:29 -07:00
diffcore.h	…
dir.c	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
dir.h	pathspec: support :(glob) syntax	2013-07-15 10:56:10 -07:00
editor.c	…
entry.c	Merge branch 'jk/check-corrupt-objects-carefully'	2013-04-03 09:34:29 -07:00
environment.c	core: use env variable instead of config var to turn on logging pack access	2013-06-09 16:07:50 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	Merge branch 'fc/fast-export-persistent-marks'	2013-06-02 15:48:28 -07:00
fetch-pack.c	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
fetch-pack.h	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	add -i: add extra options at the right place in "diff" command line	2013-06-23 13:39:39 -07:00
git-am.sh	am: replace uses of --resolved with --continue	2013-06-27 09:37:12 -07:00
git-archimport.perl	git-archimport: use a lowercase "usage:" string	2013-02-24 13:31:06 -08:00
git-bisect.sh	bisect: Fix log output for multi-parent skip ranges	2013-05-22 15:40:43 -07:00
git-compat-util.h	Merge branch 'fc/macos-x-clipped-write' into maint	2013-06-30 15:33:40 -07:00
git-cvsexportcommit.perl	git-cvsexportcommit: use a lowercase "usage:" string	2013-02-24 13:31:07 -08:00
git-cvsimport.perl	git-cvsimport: use a lowercase "usage:" string	2013-02-24 13:31:07 -08:00
git-cvsserver.perl	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
git-difftool--helper.sh	…
git-difftool.perl	difftool --dir-diff: allow changing any clean working tree file	2013-05-29 12:50:08 -07:00
git-filter-branch.sh	Merge branch 'jk/filter-branch-come-back-to-original' into maint	2013-04-22 11:26:55 -07:00
git-instaweb.sh	…
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	Merge branch 'kb/p4merge'	2013-03-26 13:15:24 -07:00
git-merge-resolve.sh	…
git-mergetool--lib.sh	mergetool--lib: refactor {diff,merge}_cmd logic	2013-06-17 13:12:55 -07:00
git-mergetool.sh	Merge branch 'al/mergetool-printf-fix'	2013-02-14 10:29:37 -08:00
git-p4.py	Merge branch 'vl/typofix'	2013-06-26 15:07:52 -07:00
git-parse-remote.sh	…
git-pull.sh	Merge branch 'jk/pull-to-integrate'	2013-07-12 12:04:06 -07:00
git-quiltimport.sh	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
git-rebase--am.sh	am: return control to caller, for housekeeping	2013-05-12 23:20:07 -07:00
git-rebase--interactive.sh	Merge branch 'af/rebase-i-merge-options'	2013-07-11 13:05:59 -07:00
git-rebase--merge.sh	rebase --merge: return control to caller, for housekeeping	2013-05-12 23:20:08 -07:00
git-rebase.sh	Merge branch 'rr/rebase-stash-store'	2013-06-27 14:29:41 -07:00
git-relink.perl	git-relink: use a lowercase "usage:" string	2013-02-24 13:31:06 -08:00
git-remote-testgit.sh	Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile	2013-06-07 16:15:32 -07:00
git-remote-testpy.py	…
git-repack.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'mt/send-email-cc-match-fix'	2013-06-27 14:29:57 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	sh-setup: add new peel_committish() helper	2013-06-14 09:41:03 -07:00
git-stash.sh	git stash: avoid data loss when "git stash save" kills a directory	2013-07-01 14:23:24 -07:00
git-submodule.sh	Merge branch 'jk/submodule-subdirectory-ok'	2013-06-30 15:39:35 -07:00
git-svn.perl	Merge branch 'vl/typofix'	2013-06-26 15:07:52 -07:00
git-web--browse.sh	web--browse: support /usr/bin/cygstart on Cygwin	2013-06-21 09:05:15 -07:00
git.c	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
git.rc	Provide a Windows version resource for the git executables.	2013-06-04 10:11:08 +01:00
git.spec.in	…
gpg-interface.c	Merge branch 'mg/gpg-interface-using-status' into maint	2013-04-03 09:26:27 -07:00
gpg-interface.h	merge/pull Check for untrusted good GPG signatures	2013-03-31 22:38:49 -07:00
graph.c	Revert "graph.c: mark private file-scope symbols as static"	2013-03-03 19:43:54 -08:00
graph.h	Revert "graph.c: mark private file-scope symbols as static"	2013-03-03 19:43:54 -08:00
grep.c	fix clang -Wtautological-compare with unsigned enum	2013-02-25 07:35:55 -08:00
grep.h	fix clang -Wtautological-compare with unsigned enum	2013-02-25 07:35:55 -08:00
hash.c	…
hash.h	Preallocate hash tables when the number of inserts are known in advance	2013-03-16 22:57:29 -07:00
help.c	Merge branch 'rj/mingw-cygwin'	2013-06-11 13:30:20 -07:00
help.h	help: add help_unknown_ref()	2013-05-08 15:31:54 -07:00
hex.c	…
http-backend.c	show_head_ref(): rename first parameter to "refname"	2013-06-02 15:28:47 -07:00
http-fetch.c	…
http-push.c	http: drop http_error function	2013-04-06 18:56:46 -07:00
http-walker.c	…
http.c	Merge branch 'bc/http-keep-memory-given-to-curl'	2013-06-27 14:29:49 -07:00
http.h	Merge branch 'mv/ssl-ftp-curl'	2013-04-19 13:31:08 -07:00
ident.c	…
imap-send.c	imap-send: eliminate HMAC deprecation warnings on Mac OS X	2013-05-21 13:26:37 -07:00
kwset.c	kwset: fix spelling in comments	2013-04-12 12:25:08 -07:00
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	line-log: convert to use parse_pathspec	2013-07-15 10:56:08 -07:00
line-log.h	log -L: store the path instead of a diff_filespec	2013-04-12 11:37:03 -07:00
line-range.c	log -L: :pattern:file syntax to find by funcname	2013-03-28 10:30:04 -07:00
line-range.h	log -L: :pattern:file syntax to find by funcname	2013-03-28 10:30:04 -07:00
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	lockfile: fix buffer overflow in path handling	2013-07-07 10:29:28 -07:00
log-tree.c	Merge branch 'as/log-output-encoding-in-user-format'	2013-07-12 12:04:01 -07:00
log-tree.h	pretty: share code between format_decoration and show_decorations	2013-04-18 16:28:27 -07:00
mailmap.c	…
mailmap.h	…
match-trees.c	match-trees: factor out fill_tree_desc_strict	2013-06-13 14:45:38 -07:00
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	remove init_pathspec() in favor of parse_pathspec()	2013-07-15 10:56:09 -07:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	Sync with 1.8.1 maintenance track	2013-04-03 09:18:01 -07:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	remove diff_tree_{setup,release}_paths	2013-07-15 10:56:09 -07:00
notes-merge.h	Move create_notes_commit() from notes-merge.c into notes-utils.c	2013-06-12 10:38:13 -07:00
notes-utils.c	Move create_notes_commit() from notes-merge.c into notes-utils.c	2013-06-12 10:38:13 -07:00
notes-utils.h	Move create_notes_commit() from notes-merge.c into notes-utils.c	2013-06-12 10:38:13 -07:00
notes.c	string_list_add_refs_by_glob(): add a comment about memory management	2013-06-02 15:28:47 -07:00
notes.h	…
object.c	Merge branch 'mh/reflife'	2013-06-14 08:46:14 -07:00
object.h	object_array_entry: fix memory handling of the name field	2013-06-02 15:28:46 -07:00
pack-check.c	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options-cb.c	prune: introduce OPT_EXPIRY_DATE() and use it	2013-04-25 11:42:10 -07:00
parse-options.c	Merge branch 'ef/non-ascii-parse-options-error-diag' into maint	2013-02-27 10:04:26 -08:00
parse-options.h	Merge branch 'jc/prune-all'	2013-05-29 14:23:04 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	parse_pathspec: make sure the prefix part is wildcard-free	2013-07-15 10:56:09 -07:00
pathspec.c	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
pathspec.h	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
pkt-line.c	pkt-line: share buffer/descriptor reading implementation	2013-02-24 00:14:15 -08:00
pkt-line.h	pkt-line: share buffer/descriptor reading implementation	2013-02-24 00:14:15 -08:00
preload-index.c	convert read_cache_preload() to take struct pathspec	2013-07-15 10:56:08 -07:00
pretty.c	Merge branch 'rs/pp-user-info-without-extra-allocation'	2013-05-01 15:24:08 -07:00
prio-queue.c	sort-in-topological-order: use prio-queue	2013-06-11 15:15:21 -07:00
prio-queue.h	sort-in-topological-order: use prio-queue	2013-06-11 15:15:21 -07:00
progress.c	strbuf: create strbuf_humanise_bytes() to show byte sizes	2013-04-10 12:58:33 -07:00
progress.h	…
prompt.c	…
prompt.h	…
quote.c	…
quote.h	…
reachable.c	use parse_object_or_die instead of die("bad object")	2013-03-17 12:52:14 -07:00
reachable.h	…
read-cache.c	convert refresh_index to take struct pathspec	2013-07-15 10:56:08 -07:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'mh/ref-races'	2013-06-30 15:40:05 -07:00
refs.h	refs: implement simple transactions for the packed-refs file	2013-06-20 15:50:17 -07:00
remote-curl.c	remote-http: use argv-array	2013-07-09 12:34:16 -07:00
remote-testsvn.c	sparse: Fix mingw_main() argument number/type errors	2013-04-28 12:32:08 -07:00
remote.c	remote: remove dead code in read_branches_file()	2013-06-23 00:33:57 -07:00
remote.h	remote.c: introduce a way to have different remotes for fetch/push	2013-04-02 10:41:42 -07:00
replace_object.c	…
rerere.c	convert unmerge_cache to take struct pathspec	2013-07-15 10:56:08 -07:00
rerere.h	rerere: convert to use parse_pathspec	2013-07-15 10:56:07 -07:00
resolve-undo.c	convert unmerge_cache to take struct pathspec	2013-07-15 10:56:08 -07:00
resolve-undo.h	convert unmerge_cache to take struct pathspec	2013-07-15 10:56:08 -07:00
revision.c	remove init_pathspec() in favor of parse_pathspec()	2013-07-15 10:56:09 -07:00
revision.h	Merge branch 'jc/topo-author-date-sort'	2013-07-01 12:41:23 -07:00
run-command.c	mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE	2013-05-08 12:14:35 -07:00
run-command.h	…
send-pack.c	pkt-line: provide a LARGE_PACKET_MAX static buffer	2013-02-20 13:42:22 -08:00
send-pack.h	…
sequencer.c	Merge branch 'rr/cherry-pick-fast-forward-reflog-message'	2013-06-27 14:30:00 -07:00
sequencer.h	…
server-info.c	…
setup.c	parse_pathspec: make sure the prefix part is wildcard-free	2013-07-15 10:56:09 -07:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'jk/unpack-entry-fallback-to-another'	2013-06-23 14:53:20 -07:00
sha1_name.c	Merge branch 'jc/t1512-fix'	2013-07-11 13:06:11 -07:00
shallow.c	fetch-pack: prepare updated shallow file before fetching the pack	2013-05-28 08:06:08 -07:00
shell.c	shell: new no-interactive-login command to print a custom message	2013-03-09 23:21:35 -08:00
shortlog.h	…
show-index.c	…
sideband.c	pkt-line: share buffer/descriptor reading implementation	2013-02-24 00:14:15 -08:00
sideband.h	pkt-line: move LARGE_PACKET_MAX definition from sideband	2013-02-20 13:42:22 -08:00
sigchain.c	…
sigchain.h	…
strbuf.c	strbuf: create strbuf_humanise_bytes() to show byte sizes	2013-04-10 12:58:33 -07:00
strbuf.h	strbuf: create strbuf_humanise_bytes() to show byte sizes	2013-04-10 12:58:33 -07:00
streaming.c	avoid infinite loop in read_istream_loose	2013-03-27 13:47:02 -07:00
streaming.h	…
string-list.c	…
string-list.h	…
submodule.c	rm: delete .gitmodules entry of submodules removed from the work tree	2013-08-06 14:11:00 -07:00
submodule.h	rm: delete .gitmodules entry of submodules removed from the work tree	2013-08-06 14:11:00 -07:00
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	Merge branch 'js/test-ln-s-add'	2013-06-20 16:02:18 -07:00
test-ctype.c	…
test-date.c	…
test-delta.c	tests: use a lowercase "usage:" string	2013-02-24 21:30:10 -08:00
test-dump-cache-tree.c	…
test-genrandom.c	tests: use a lowercase "usage:" string	2013-02-24 21:30:10 -08:00
test-index-version.c	sparse: Fix mingw_main() argument number/type errors	2013-04-28 12:32:08 -07:00
test-line-buffer.c	…
test-match-trees.c	…
test-mergesort.c	sparse: Fix mingw_main() argument number/type errors	2013-04-28 12:32:08 -07:00
test-mktemp.c	…
test-parse-options.c	sparse: Fix mingw_main() argument number/type errors	2013-04-28 12:32:08 -07:00
test-path-utils.c	…
test-prio-queue.c	prio-queue: priority queue of pointers to structs	2013-06-11 15:15:21 -07:00
test-read-cache.c	read-cache: add simple performance test	2013-06-09 17:03:00 -07:00
test-regex.c	…
test-revision-walking.c	…
test-run-command.c	…
test-scrap-cache-tree.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-list.c	…
test-subprocess.c	sparse: Fix mingw_main() argument number/type errors	2013-04-28 12:32:08 -07:00
test-svn-fe.c	msvc: test-svn-fe: Fix linker "unresolved external" error	2013-02-25 12:40:34 -08:00
test-wildmatch.c	…
thread-utils.c	mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE	2013-05-08 12:14:35 -07:00
thread-utils.h	…
trace.c	…
transport-helper.c	transport-helper: be quiet on read errors from helpers	2013-06-21 09:03:53 -07:00
transport.c	Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'	2013-06-26 15:07:48 -07:00
transport.h	Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'	2013-06-26 15:07:48 -07:00
tree-diff.c	pathspec: support :(literal) syntax for noglob pathspec	2013-07-15 10:56:09 -07:00
tree-walk.c	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
tree-walk.h	unpack-trees: don't shift conflicts left and right	2013-06-17 09:24:47 -07:00
tree.c	checkout: convert read_tree_some to take struct pathspec	2013-07-15 10:56:08 -07:00
tree.h	checkout: convert read_tree_some to take struct pathspec	2013-07-15 10:56:08 -07:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'rs/unpack-trees-tree-walk-conflict-field'	2013-06-24 13:48:44 -07:00
unpack-trees.h	diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const	2013-06-02 15:31:14 -07:00
upload-pack.c	upload-pack: ignore 'shallow' lines with unknown obj-ids	2013-04-28 22:33:53 -07:00
url.c	…
url.h	…
usage.c	Merge branch 'jk/a-thread-only-dies-once' into maint	2013-04-26 11:25:59 -07:00
userdiff.c	…
userdiff.h	…
utf8.c	pretty: Fix bug in truncation support for %>, %< and %><	2013-04-28 12:09:37 -07:00
utf8.h	pretty: support %>> that steal trailing spaces	2013-04-18 16:28:29 -07:00
varint.c	…
varint.h	…
version.c	…
version.h	…
walker.c	…
walker.h	…
wildmatch.c	wildmatch: properly fold case everywhere	2013-06-02 14:13:05 -07:00
wildmatch.h	…
wrap-for-bin.sh	…
wrapper.c	config: allow inaccessible configuration under $HOME	2013-04-15 07:26:50 -07:00
write_or_die.c	write_or_die: raise SIGPIPE when we get EPIPE	2013-02-20 13:42:21 -08:00
ws.c	…
wt-status.c	convert {read,fill}_directory to take struct pathspec	2013-07-15 10:56:08 -07:00
wt-status.h	status: convert to use parse_pathspec	2013-07-15 10:56:07 -07:00
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	zlib: fix compilation failures with Sun C Compilaer	2013-04-22 09:49:04 -07: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 version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

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 (read
Documentation/SubmittingPatches for instructions on patch submission).
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://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.