diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-10-27 14:11:50 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-10-27 14:11:50 +0800 |
| commit | d7d5b2ec9a747fac48bd50152e2023d33e78393c (patch) | |
| tree | a46aae407bb897fac3efa86aa24089f4df2d33df /lisp/emacs-lisp/backtrace.el | |
| parent | d354300993e6a48e2d3e72a7e89348cc06b326fb (diff) | |
| download | emacs-d7d5b2ec9a747fac48bd50152e2023d33e78393c.tar.gz emacs-d7d5b2ec9a747fac48bd50152e2023d33e78393c.tar.bz2 emacs-d7d5b2ec9a747fac48bd50152e2023d33e78393c.zip | |
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.
Diffstat (limited to 'lisp/emacs-lisp/backtrace.el')
0 files changed, 0 insertions, 0 deletions