diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:59:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:59:04 -0800 |
| commit | 3576f113cb3f36b9e2b36a84573754a922f2998b (patch) | |
| tree | 6a37475bcceb021ee9b3f2345abac1dd4078c9e6 /diff.h | |
| parent | c5a77e8f9293674e9a936f01cc1719a316f87d24 (diff) | |
| parent | f8c872127d4c48a6ec02abce34cb059ddeb6402a (diff) | |
| download | git-3576f113cb3f36b9e2b36a84573754a922f2998b.tar.xz | |
Merge branch 'nv/parseopt-opt-arg'
Enhance "rev-parse --parseopt" mode to help parsing options with
an optional parameter.
* nv/parseopt-opt-arg:
rev-parse --parseopt: add the --stuck-long mode
Use the word 'stuck' instead of 'sticked'
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -244,7 +244,7 @@ extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *pat #define DIFF_SETUP_USE_SIZE_CACHE 4 /* - * Poor man's alternative to parse-option, to allow both sticked form + * Poor man's alternative to parse-option, to allow both stuck form * (--option=value) and separate form (--option value). */ extern int parse_long_opt(const char *opt, const char **argv, |