summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2013-10-31 11:08:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-31 22:47:38 (GMT)
commitb0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0 (patch)
treecc88e52cbeb9f90ea911dfca407b98ad36272c6b /diff.h
parent3d092bfc6f2d9a998967979f926c661e9762601c (diff)
downloadgit-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.zip
git-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.tar.gz
git-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.tar.bz2
Use the word 'stuck' instead of 'sticked'
The past participle of 'stick' is 'stuck'. Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index e342325..1c05b3a 100644
--- a/diff.h
+++ b/diff.h
@@ -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,