1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00
Find a file
Jonathan Nieder 71c7b0538f add -u: only show pathless 'add -u' warning when changes exist outside cwd
A common workflow in large projects is to chdir into a subdirectory of
interest and only do work there:

	cd src
	vi foo.c
	make test
	git add -u
	git commit

The upcoming change to 'git add -u' behavior would not affect such a
workflow: when the only changes present are in the current directory,
'git add -u' will add all changes, and whether that happens via an
implicit "." or implicit ":/" parameter is an unimportant
implementation detail.

The warning about use of 'git add -u' with no pathspec is annoying
because it seemingly serves no purpose in this case.  So suppress the
warning unless there are changes outside the cwd that are not being
added.

A previous version of this patch ran two I/O-intensive diff-files
passes: one to find changes outside the cwd, and another to find
changes to add to the index within the cwd.  This version runs one
full-tree diff and decides for each change whether to add it or warn
and suppress it in update_callback.  As a result, even on very large
repositories "git add -u" will not be significantly slower than the
future default behavior ("git add -u :/"), and the slowdown relative
to "git add -u ." should be a useful clue to users of such
repositories to get into the habit of explicitly passing '.'.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-03 11:34:22 -07:00
block-sha1
builtin add -u: only show pathless 'add -u' warning when changes exist outside cwd 2013-04-03 11:34:22 -07:00
compat Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
contrib Merge branch 'mp/complete-paths' 2013-03-07 13:11:55 -08:00
Documentation Merge branch 'gp/add-u-A-documentation' 2013-03-11 08:11:38 -07:00
git-gui
git_remote_helpers git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" 2013-01-30 12:34:55 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-01-30 13:52:44 -08:00
gitweb gitweb/README: remove reference to git.kernel.org 2013-03-07 11:38:33 -08:00
mergetools Merge branch 'da/p4merge-mktemp-fix' 2013-02-14 16:05:56 -08:00
perl git svn: consistent spacing after "W:" in warnings 2013-03-08 09:53:57 +00:00
po l10n: zh_CN.po: translate 1 new message 2013-03-07 08:46:19 +08:00
ppc
t t2200: check that "add -u" limits itself to subdirectory 2013-03-14 08:24:12 -07:00
templates Add sample pre-push hook script 2013-01-18 11:13:22 -08:00
vcs-svn
xdiff
.gitattributes
.gitignore gitk: Ignore gitk-wish buildproduct 2013-01-30 21:12:16 +11:00
.mailmap
abspath.c
aclocal.m4
advice.c push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
advice.h push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
alias.c
alloc.c
archive-tar.c archive-tar: use parse_config_key when parsing config 2013-01-23 08:41:50 -08:00
archive-zip.c Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint 2013-01-20 17:22:27 -08:00
archive.c
archive.h
argv-array.c
argv-array.h
attr.c Sync with 1.8.1.5 2013-03-01 13:17:18 -08:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h add -u: only show pathless 'add -u' warning when changes exist outside cwd 2013-04-03 11:34:22 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/diff-graph-cleanup' 2013-02-14 10:29:59 -08:00
command-list.txt Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
commit.c
commit.h Merge branch 'jk/read-commit-buffer-data-after-free' 2013-02-04 10:25:18 -08:00
config.c Merge branch 'jk/config-parsing-cleanup' 2013-02-04 10:24:50 -08:00
config.mak.in Merge branch 'ct/autoconf-htmldir' 2013-02-25 08:27:04 -08:00
config.mak.uname Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
configure.ac Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
connect.c
connected.c
connected.h
convert.c convert some config callbacks to parse_config_key 2013-01-23 08:41:50 -08:00
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
diff-no-index.c
diff.c Merge branch 'mp/diff-algo-config' 2013-02-17 15:25:52 -08:00
diff.h Merge branch 'mp/diff-algo-config' 2013-02-17 15:25:52 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'ap/status-ignored-in-ignored-directory' into maint 2013-01-28 11:10:25 -08:00
dir.h Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
editor.c
entry.c
environment.c Merge branch 'jc/custom-comment-char' 2013-02-04 10:23:49 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c Merge branch 'jk/gc-auto-after-fetch' 2013-02-01 12:40:16 -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 'jc/fake-ancestor-with-non-blobs' into maint 2013-02-07 15:14:22 -08:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: format commit timestamp ourselves without using strftime 2013-02-09 14:41:49 -08:00
git-cvsserver.perl
git-difftool--helper.sh difftool--helper: fix printf usage 2013-02-10 11:35:50 -08:00
git-difftool.perl git-difftool: use git-mergetool--lib for "--tool-help" 2013-01-25 11:08:55 -08:00
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 doc: generate a list of valid merge tools 2013-02-02 21:46:52 -08:00
git-mergetool.sh Merge branch 'al/mergetool-printf-fix' 2013-02-14 10:29:37 -08:00
git-p4.py Merge branch 'pw/git-p4-on-cygwin' 2013-02-04 10:25:30 -08:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'jk/rebase-i-comment-char' 2013-02-17 15:25:20 -08:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit
git-remote-testpy.py git-remote-testpy: fix path hashing on Python 3 2013-01-28 09:55:14 -08:00
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'nz/send-email-headers-are-case-insensitive' into maint 2013-01-20 17:22:49 -08:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Allow custom "comment char" 2013-01-16 12:48:22 -08:00
git-svn.perl git-svn: Simplify calculation of GIT_DIR 2013-01-24 10:21:23 +00:00
GIT-VERSION-GEN Git 1.8.2-rc3 2013-03-07 13:14:39 -08:00
git-web--browse.sh
git.c Merge branch 'maint' 2013-03-10 22:29:29 -07:00
git.spec.in
gpg-interface.c Merge branch 'sb/gpg-plug-fd-leak' into maint 2013-02-07 15:14:54 -08:00
gpg-interface.h
graph.c graph: output padding for merge subsequent parents 2013-02-07 12:54:26 -08:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c help: include <common-cmds.h> only in one file 2013-01-18 22:35:04 -08:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Allow building with xmlparse.h 2013-02-11 14:33:04 -08:00
http-walker.c
http.c http_request: reset "type" strbuf before adding 2013-02-06 07:50:56 -08:00
http.h Verify Content-Type from smart HTTP servers 2013-02-04 10:22:36 -08:00
ident.c Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint 2013-02-04 10:04:26 -08:00
imap-send.c Sync with v1.8.1.4 2013-02-19 21:57:27 -08:00
INSTALL INSTALL: git-p4 does not support Python 3 2013-01-30 11:17:59 -08:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c convert some config callbacks to parse_config_key 2013-01-23 08:41:50 -08:00
ll-merge.h
lockfile.c
log-tree.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
log-tree.h
mailmap.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
mailmap.h
Makefile Merge branch 'jn/less-reconfigure' into maint 2013-02-27 09:59:19 -08:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c diff: Introduce --diff-algorithm command line option 2013-01-16 09:41:18 -08:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c name-hash: allow hashing an empty string 2013-02-19 14:00:12 -08:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c
notes.h
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
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 fix clang -Wunused-value warnings for error functions 2013-01-16 12:47:46 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c logmsg_reencode: lazily load missing commit buffers 2013-01-26 13:28:22 -08:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Enable minimal stat checking 2013-01-22 09:33:16 -08:00
README Merge branch 'ta/doc-no-small-caps' 2013-02-05 16:13:32 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/hidden-refs' 2013-02-17 15:25:57 -08:00
refs.h upload/receive-pack: allow hiding ref hierarchies 2013-02-07 13:48:47 -08:00
RelNotes Prepare for 1.8.1.5 2013-02-25 08:26:25 -08:00
remote-curl.c Verify Content-Type from smart HTTP servers 2013-02-04 10:22:36 -08:00
remote-testsvn.c
remote.c Merge branch 'jc/push-reject-reasons' 2013-02-04 10:25:04 -08:00
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c log: re-encode commit messages before grepping 2013-02-11 13:11:45 -08:00
revision.h Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
run-command.c Merge branch 'sb/run-command-fd-error-reporting' 2013-02-07 14:41:42 -08:00
run-command.h hooks: Add function to check if a hook exists 2013-01-14 09:25:40 -08:00
send-pack.c push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c Merge branch 'mh/maint-ceil-absolute' 2013-02-27 09:47:28 -08:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c
sha1_name.c
shallow.c upload-pack: fix off-by-one depth calculation in shallow clone 2013-01-11 09:10:57 -08:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Allow custom "comment char" 2013-01-16 12:48:22 -08:00
strbuf.h Allow custom "comment char" 2013-01-16 12:48:22 -08:00
streaming.c
streaming.h
string-list.c Merge branch 'mh/ceiling' into maint 2013-01-28 11:07:18 -08:00
string-list.h Merge branch 'mh/ceiling' into maint 2013-01-28 11:07:18 -08:00
submodule.c submodule: simplify memory handling in config parsing 2013-01-23 12:58:27 -08:00
submodule.h
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-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 push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
transport.c Merge branch 'ft/transport-report-segv' into maint 2013-02-07 15:15:08 -08:00
transport.h Merge branch 'jc/push-reject-reasons' 2013-02-04 10:25:04 -08:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
unpack-trees.h
upload-pack.c Merge branch 'jc/hidden-refs' 2013-02-17 15:25:57 -08:00
url.c
url.h
usage.c
userdiff.c userdiff: drop parse_driver function 2013-01-23 08:41:51 -08:00
userdiff.h
utf8.c Merge branch 'jx/utf8-printf-width' into maint 2013-02-25 08:03:59 -08:00
utf8.h Merge branch 'jx/utf8-printf-width' into maint 2013-02-25 08:03:59 -08:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c Merge branch 'jn/warn-on-inaccessible-loosen' into maint 2013-01-11 16:47:07 -08:00
write_or_die.c
ws.c
wt-status.c Merge branch 'nd/status-show-in-progress' 2013-02-14 10:29:54 -08:00
wt-status.h status: show the branch name if possible in in-progress info 2013-02-05 08:21:02 -08: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.