]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ade4c6d) | patch
vc-git-resolve-conflicts: Extend unstage-maybe to similar operations
authorSean Whitton <spwhitton@spwhitton.name>
Sun, 27 Oct 2024 06:11:50 +0000 (14:11 +0800)
committerEshel Yaron <me@eshelyaron.com>
Tue, 29 Oct 2024 09:54:01 +0000 (10:54 +0100)
commit10c977ab5de3d686d57e8c08504ee182dc56fa28
tree838a960860db35ee897aae9c65b8fb76a4bdf6f4tree | snapshot
parentade4c6d377997a1834c6a578f19aa30061ece94acommit | diff
vc-git-resolve-conflicts: Extend unstage-maybe to similar operations

* lisp/vc/vc-git.el (vc-git-resolve-when-done): When
vc-git-resolve-conflicts is unstage-maybe, don't clear the
staging area during a rebase, am, revert or cherry-pick.
(vc-git-resolve-conflicts): Update docstring in light of changes
to vc-git-resolve-when-done.
(vc-git--cmds-in-progress): Detect reverts and cherry-pick
operations in progress.

(cherry picked from commit d7d5b2ec9a747fac48bd50152e2023d33e78393c)
lisp/vc/vc-git.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.