diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 16:08:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 16:08:23 -0700 |
| commit | 9b8ae93ad92efef59649a3a7c4bed162d2051059 (patch) | |
| tree | 0661cd870dec63e098efef7e1fb7db31505dbbb2 /builtin-checkout-index.c | |
| parent | 01914577ed42498d9e268684949d699e0272e964 (diff) | |
| parent | de5d560c99c96e2955fb4d1d8a8fa6b469926292 (diff) | |
| download | git-9b8ae93ad92efef59649a3a7c4bed162d2051059.tar.gz | |
Merge branch 'maint'
* maint:
Start 1.6.0.2 maintenance cycle
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
Fix passwd(5) ref and reflect that commit doens't use commit-tree
improve handling of sideband message display
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
checkout: fix message when leaving detached HEAD
clone: fix creation of explicitly named target directory
'git foo' program identifies itself without dash in die() messages
setup_git_directory(): fix move to worktree toplevel directory
update-index: fix worktree setup
Start conforming code to "git subcmd" style
read-tree: setup worktree if merge is required
grep: fix worktree setup
diff*: fix worktree setup
Conflicts:
RelNotes
t/t3900-i18n-commit.sh
t/t7003-filter-branch.sh
Diffstat (limited to 'builtin-checkout-index.c')
| -rw-r--r-- | builtin-checkout-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c index 71ebabf990..90f8523eb5 100644 --- a/builtin-checkout-index.c +++ b/builtin-checkout-index.c @@ -258,9 +258,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) const char *p; if (all) - die("git-checkout-index: don't mix '--all' and explicit filenames"); + die("git checkout-index: don't mix '--all' and explicit filenames"); if (read_from_stdin) - die("git-checkout-index: don't mix '--stdin' and explicit filenames"); + die("git checkout-index: don't mix '--stdin' and explicit filenames"); p = prefix_path(prefix, prefix_length, arg); checkout_file(p, prefix_length); if (p < arg || p > arg + strlen(arg)) @@ -271,7 +271,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) struct strbuf buf, nbuf; if (all) - die("git-checkout-index: don't mix '--all' and '--stdin'"); + die("git checkout-index: don't mix '--all' and '--stdin'"); strbuf_init(&buf, 0); strbuf_init(&nbuf, 0); |