diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:44:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:44:52 -0800 |
| commit | 750054cd3f1298bc9e113a47eaa6346923e08c19 (patch) | |
| tree | 2a1f04ed14b6a705723c2832939d50b302252625 /diff-no-index.c | |
| parent | 1b8dbdb41e503f6829be4e1d8ada4c8eabbc49bd (diff) | |
| parent | d74bb308fa9e49e0a5b9a0792e6079bbc0c8aea8 (diff) | |
| download | git-750054cd3f1298bc9e113a47eaa6346923e08c19.tar.gz | |
Merge branch 'jn/help-everywhere'
* jn/help-everywhere: (23 commits)
diff --no-index: make the usage string less scary
merge-{recursive,subtree}: use usagef() to print usage
Introduce usagef() that takes a printf-style format
Let 'git <command> -h' show usage without a git dir
Show usage string for 'git http-push -h'
Let 'git http-fetch -h' show usage outside any git repository
Show usage string for 'git stripspace -h'
Show usage string for 'git unpack-file -h'
Show usage string for 'git show-index -h'
Show usage string for 'git rev-parse -h'
Show usage string for 'git merge-one-file -h'
Show usage string for 'git mailsplit -h'
Show usage string for 'git imap-send -h'
Show usage string for 'git get-tar-commit-id -h'
Show usage string for 'git fast-import -h'
Show usage string for 'git check-ref-format -h'
http-fetch: add missing initialization of argv0_path
Show usage string for 'git show-ref -h'
Show usage string for 'git merge-ours -h'
Show usage string for 'git commit-tree -h'
...
Conflicts:
imap-send.c
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 4ebc1dbd87..aae8e7accc 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -201,8 +201,8 @@ void diff_no_index(struct rev_info *revs, return; } if (argc != i + 2) - die("git diff %s takes two paths", - no_index ? "--no-index" : "[--no-index]"); + usagef("git diff %s <path> <path>", + no_index ? "--no-index" : "[--no-index]"); diff_setup(&revs->diffopt); for (i = 1; i < argc - 2; ) { |