[RFC PATCH 2/2] pull: allow -e as a synonym for --edit

[Rafael Ascensão]

`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.al...@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