diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:13:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:13:55 -0700 |
| commit | 4f337e24662f07513fd6e8388f27f13dbe44cadc (patch) | |
| tree | 8ad206ef3ff7aa7117a5c9120bbd45345ff7ae3a /contrib/examples/git-reset.sh | |
| parent | 17ed158021ead9cb056f692fc35ff3fcde96a747 (diff) | |
| parent | 15eda0202aa3c63fa7b8f9f72df86f4e50eb1d2b (diff) | |
| download | git-4f337e24662f07513fd6e8388f27f13dbe44cadc.tar.gz | |
Merge branch 'maint'
* maint:
git-svn: don't attempt to spawn pager if we don't want one
Supplant the "while case ... break ;; esac" idiom
User Manual: add a chapter for submodules
user-manual: don't assume refs are stored under .git/refs
Detect exec bit in more cases.
Conjugate "search" correctly in the git-prune-packed man page.
Move the paragraph specifying where the .idx and .pack files should be
Documentation/git-lost-found.txt: drop unnecessarily duplicated name.
Diffstat (limited to 'contrib/examples/git-reset.sh')
| -rwxr-xr-x | contrib/examples/git-reset.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-reset.sh b/contrib/examples/git-reset.sh index 1dc606fbd3..bafeb52cd1 100755 --- a/contrib/examples/git-reset.sh +++ b/contrib/examples/git-reset.sh @@ -11,7 +11,7 @@ require_work_tree update= reset_type=--mixed unset rev -while case $# in 0) break ;; esac +while test $# != 0 do case "$1" in --mixed | --soft | --hard) |