diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2022-02-19 20:59:45 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2022-02-19 21:01:18 -0500 |
| commit | 222cbb30f9fcbbb619b5c826301566c8efbae463 (patch) | |
| tree | 37164fdd0a4384afef4dc54fb451e385d089b85c /docs/RelNotes | |
| parent | adda58b091b2bdca96094268e3b7188b62102c0e (diff) | |
magit-pull-from-pushremote: Restore use of magit-run-git-with-editor
7fee4089 (Refactor commands that can set the push-remote before their
main task, 2019-03-29) switched magit-pull-from-pushremote to using
magit-run-git-async instead of magit-run-git-with-editor (likely a
copy-paste error from magit-push-current-to-pushremote). Go back to
using magit-run-git-with-editor because, when pull is configured to
merge, Git will pop up an editor for non-fast-forward merges.
Fixes #4604.
Diffstat (limited to 'docs/RelNotes')
| -rw-r--r-- | docs/RelNotes/3.4.0.org | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/RelNotes/3.4.0.org b/docs/RelNotes/3.4.0.org index cc0c0aa..5021c97 100644 --- a/docs/RelNotes/3.4.0.org +++ b/docs/RelNotes/3.4.0.org @@ -48,3 +48,6 @@ - ~magit-discard~ didn't properly handle conflicts resulting from a file being renamed on both sides. #4225 + +- Since v3.0.0, ~magit-pull-from-pushremote~ has failed on + non-fast-forward merges. #4604 |