From: "Rafael Ascensão" <rafa.almas@gmail•com>
To: git@vger•kernel.org
Cc: "Rafael Ascensão" <rafa.almas@gmail•com>,
"Marius Giurgi" <marius.giurgi@gmail•com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>,
"Michael Haggerty" <mhagger@alum•mit.edu>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Junio C Hamano" <gitster@pobox•com>
Subject: [RFC PATCH 2/2] pull: allow -e as a synonym for --edit
Date: Mon, 4 Jun 2018 22:50:23 +0100 [thread overview]
Message-ID: <20180604215023.20525-2-rafa.almas@gmail.com> (raw)
In-Reply-To: <20180604215023.20525-1-rafa.almas@gmail.com>
`git pull`'s documentation mentions that `--edit` can be used with short
option `-e`. But `git pull` doesn't understand `-e`.
To make things consistent, teach `git pull` `-e` for `--edit`
Signed-off-by: Rafael Ascensão <rafa.almas@gmail•com>
---
builtin/pull.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index e32d6cd5b..dd54f2e57 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -154,7 +154,7 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "commit", &opt_commit, NULL,
N_("perform a commit if the merge succeeds (default)"),
PARSE_OPT_NOARG),
- OPT_PASSTHRU(0, "edit", &opt_edit, NULL,
+ OPT_PASSTHRU('e', "edit", &opt_edit, NULL,
N_("edit message before committing"),
PARSE_OPT_NOARG),
OPT_PASSTHRU(0, "ff", &opt_ff, NULL,
--
2.17.1
next prev parent reply other threads:[~2018-06-04 21:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 21:50 [RFC PATCH 1/2] docs: reflect supported fetch options of git pull Rafael Ascensão
2018-06-04 21:50 ` Rafael Ascensão [this message]
2018-06-05 16:05 ` Duy Nguyen
2018-06-05 20:46 ` Rafael Ascensão
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180604215023.20525-2-rafa.almas@gmail.com \
--to=rafa.almas@gmail$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=marius.giurgi@gmail$(echo .)com \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox