This makes sure we have a command line option that corresponds with the
config file option.
 Documentation/git-cherry-pick.txt | 1 +
 builtin/revert.c                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-cherry-pick.txt 
index c0274bd..63db07d 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -57,6 +57,7 @@ OPTIONS
        message prior to committing.
        When recording the commit, append a line that says
        "(cherry picked from commit ...)" to the original commit
        message in order to indicate which commit this change was
diff --git a/builtin/revert.c b/builtin/revert.c
index 0c14af4..899f3e4 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -99,7 +99,7 @@ static void parse_args(int argc, const char **argv, struct 
replay_opts *opts)
        if (opts->action == REPLAY_PICK) {
                struct option cp_extra[] = {
-                       OPT_BOOL('x', NULL, &opts->record_origin, N_("append 
commit name")),
+                       OPT_BOOL('x', "record-origin", &opts->record_origin, 
N_("append commit name")),
                        OPT_BOOL(0, "ff", &opts->allow_ff, N_("allow 
                        OPT_BOOL(0, "allow-empty", &opts->allow_empty, 
N_("preserve initially empty commits")),
                        OPT_BOOL(0, "allow-empty-message", 
&opts->allow_empty_message, N_("allow commits with empty messages")),

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to