diff options
| author |  Joel Klinghed <the_jk@spawned.biz> | 2021-08-14 21:40:30 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-15 09:44:08 -0700 |
| commit | 8ef6aad664715c16caf6e36a7f6b174a06574477 (patch) | |
| tree | 96e439d18259f1fcc2262478b9b5a7c3113b4231 /builtin/pull.c | |
| parent | Git 2.33-rc2 (diff) | |
| download | tgif-8ef6aad664715c16caf6e36a7f6b174a06574477.tar.xz | |
commit: restore --edit when combined with --fixup
Recent changes to --fixup, adding amend suboption, caused the
--edit flag to be ignored as use_editor was always set to zero.
Restore edit_flag having higher priority than fixup_message when
deciding the value of use_editor by moving the edit flag condition
later in the method.
Signed-off-by: Joel Klinghed <the_jk@spawned.biz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
0 files changed, 0 insertions, 0 deletions