summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
commit4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch)
tree77d37de207313b760eb08c502be1ea98a18351e9 /parse-options.c
parentMerge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' (diff)
parentTeach --[no-]rerere-autoupdate option to merge, revert and friends (diff)
downloadtgif-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.xz
Merge branch 'jc/rerere'
* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/parse-options.c b/parse-options.c
index f5594114ed..10ec21fb89 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -633,3 +633,10 @@ int parse_opt_with_commit(const struct option *opt, const char *arg, int unset)
commit_list_insert(commit, opt->value);
return 0;
}
+
+int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
+{
+ int *target = opt->value;
+ *target = unset ? 2 : 1;
+ return 0;
+}