diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-21 01:34:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-21 01:34:54 -0700 |
| commit | 328b710d800dc3786fe2b8595e5553dc4a4af424 (patch) | |
| tree | 451935aff364f1fd65340dbb79242780f04ea87a /git-clean.sh | |
| parent | fmt-patch: understand old <his> notation (diff) | |
| parent | diff family: add --check option (diff) | |
| download | tgif-328b710d800dc3786fe2b8595e5553dc4a4af424.tar.xz | |
Merge branch 'master' into js/fmt-patch
* master: (119 commits)
diff family: add --check option
Document that "git add" only adds non-ignored files.
Add a conversion tool to migrate remote information into the config
fetch, pull: ask config for remote information
Fix build procedure for builtin-init-db
read-tree -m -u: do not overwrite or remove untracked working tree files.
apply --cached: do not check newly added file in the working tree
Implement a --dry-run option to git-quiltimport
Implement git-quiltimport
Revert "builtin-grep: workaround for non GNU grep."
builtin-grep: workaround for non GNU grep.
builtin-grep: workaround for non GNU grep.
git-am: use apply --cached
apply --cached: apply a patch without using working tree.
apply --numstat: show new name, not old name.
Documentation/Makefile: create tarballs for the man pages and html files
Allow pickaxe and diff-filter options to be used by git log.
Libify the index refresh logic
Builtin git-init-db
Remove unnecessary local in get_ref_sha1.
...
Diffstat (limited to 'git-clean.sh')
| -rwxr-xr-x | git-clean.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/git-clean.sh b/git-clean.sh index b200868e60..bb56264e04 100755 --- a/git-clean.sh +++ b/git-clean.sh @@ -3,13 +3,15 @@ # Copyright (c) 2005-2006 Pavel Roskin # -USAGE="[-d] [-n] [-q] [-x | -X]" +USAGE="[-d] [-n] [-q] [-x | -X] [--] <paths>..." LONG_USAGE='Clean untracked files from the working directory -d remove directories as well -n don'\''t remove anything, just show what would be done -q be quiet, only report errors -x remove ignored files as well - -X remove only ignored files as well' + -X remove only ignored files +When optional <paths>... arguments are given, the paths +affected are further limited to those that match them.' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -44,8 +46,15 @@ do -X) ignoredonly=1 ;; - *) + --) + shift + break + ;; + -*) usage + ;; + *) + break esac shift done @@ -64,7 +73,7 @@ if [ -z "$ignored" ]; then fi fi -git-ls-files --others --directory $excl ${excl_info:+"$excl_info"} | +git-ls-files --others --directory $excl ${excl_info:+"$excl_info"} -- "$@" | while read -r file; do if [ -d "$file" -a ! -L "$file" ]; then if [ -z "$cleandir" ]; then |