1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 18:23:01 +01:00
Find a file
Jens Lehmann a88c915de9 mv: move submodules using a gitfile
When moving a submodule which uses a gitfile to point to the git directory
stored in .git/modules/<name> of the superproject two changes must be made
to make the submodule work: the .git file and the core.worktree setting
must be adjusted to point from work tree to git directory and back.

Achieve that by remembering which submodule uses a gitfile by storing the
result of read_gitfile() of each submodule. If that is not NULL the new
function connect_work_tree_and_git_dir() is called after renaming the
submodule's work tree which updates the two settings to the new values.

Extend the man page to inform the user about that feature (and while at it
change the description to not talk about a script anymore, as mv is a
builtin for quite some time now).

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-30 13:52:53 -07:00
block-sha1
builtin mv: move submodules using a gitfile 2013-07-30 13:52:53 -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
Documentation mv: move submodules using a gitfile 2013-07-30 13:52:53 -07:00
git-gui
git_remote_helpers
gitk-git
gitweb gitweb: allow extra breadcrumbs to prefix the trail 2013-07-04 21:52:15 -07:00
mergetools
perl
po
ppc
t mv: move submodules using a gitfile 2013-07-30 13:52:53 -07:00
templates
vcs-svn
xdiff
.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
abspath.c
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
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
attr.h
base85.c
bisect.c
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
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
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.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
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
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
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
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-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'rs/pickaxe-simplify' 2013-07-12 12:04:17 -07:00
diffcore-rename.c
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
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c
fetch-pack.h
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-bisect.sh
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-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
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
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
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'af/rebase-i-merge-options' 2013-07-11 13:05:59 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'rr/rebase-stash-store' 2013-06-27 14:29:41 -07:00
git-relink.perl
git-remote-testgit.sh
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
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-VERSION-GEN Git 1.8.3.2 2013-06-28 14:56:30 -07:00
git-web--browse.sh
git.c parse_pathspec: accept :(icase)path syntax 2013-07-15 12:14:38 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'bc/http-keep-memory-given-to-curl' 2013-06-27 14:29:49 -07:00
http.h
ident.c
imap-send.c
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c line-log: convert to use parse_pathspec 2013-07-15 10:56:08 -07:00
line-log.h
line-range.c
line-range.h
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
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2013-07-05 01:16:27 -07:00
match-trees.c
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
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
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
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.h
preload-index.c convert read_cache_preload() to take struct pathspec 2013-07-15 10:56:08 -07:00
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c convert refresh_index to take struct pathspec 2013-07-15 10:56:08 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'mh/ref-races' 2013-06-30 15:40:05 -07:00
refs.h
RelNotes Start preparing for 1.8.3.3 2013-06-30 15:36:03 -07:00
remote-curl.c remote-http: use argv-array 2013-07-09 12:34:16 -07:00
remote-testsvn.c
remote.c
remote.h
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
run-command.h
send-pack.c
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
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c mv: move submodules using a gitfile 2013-07-30 13:52:53 -07:00
submodule.h mv: move submodules using a gitfile 2013-07-30 13:52:53 -07:00
symlinks.c
tag.c
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-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
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
test-svn-fe.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
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
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
upload-pack.c
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
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

////////////////////////////////////////////////////////////////

	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.