diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:10:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:10:36 -0800 |
| commit | 45a7b55d6fe69581d12b83f63337eaa1015b6717 (patch) | |
| tree | 3d1911318c7fac20332867a64b3d13227524c636 /builtin | |
| parent | 2ab32a330c32d6b31928e50c9e06a0266e144e40 (diff) | |
| parent | 49bd56a5f7b09f89b59a6a77d331e8f85f6d7fde (diff) | |
| download | git-45a7b55d6fe69581d12b83f63337eaa1015b6717.tar.gz git-45a7b55d6fe69581d12b83f63337eaa1015b6717.tar.xz | |
Merge branch 'sn/diff-doc'
* sn/diff-doc:
docs: clarify git diff modes of operation
diff,difftool: Don't use the {0,2} notation in usage strings
CodingGuidelines: Add a section on writing documentation
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index a43d32636..945e7583a 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -22,7 +22,7 @@ struct blobinfo { }; static const char builtin_diff_usage[] = -"git diff <options> <rev>{0,2} -- <path>*"; +"git diff [<options>] [<commit> [<commit>]] [--] [<path>...]"; static void stuff_change(struct diff_options *opt, unsigned old_mode, unsigned new_mode, |