summaryrefslogtreecommitdiff
path: root/lisp/vc
Commit message (Expand)AuthorAgeFilesLines
* ; * lisp/vc/ediff-diff.el (ediff-auto-refine): Fix last change.Eli Zaretskii2023-05-131-1/+1
* Always default ediff-auto-refine to 'onPeter Oliver2023-05-131-1/+1
* Make vc-hg-annotate-command asyncSpencer Baugh2023-05-051-1/+1
* ; Minor fixes for user-facing text in last vc-cvs.el changesEli Zaretskii2023-04-201-37/+40
* ; Double space at end of sentence for vc-cvs.elRobert Pluim2023-04-191-11/+11
* VC: Allow `vc-default-revert' (and CVS) to revert a missing fileOlivier Certner2023-04-191-1/+2
* VC: CVS: Fix parsing of 'cvs -qn update' for missing files for 1.12Olivier Certner2023-04-191-4/+7
* VC: CVS: Fix "Root" file parsingOlivier Certner2023-04-191-65/+139
* Merge from origin/emacs-29Eli Zaretskii2023-04-151-1/+1
|\
| * ; vc-checkout: Wrap var lookup in 'bound-and-true-p'Dmitry Gutov2023-04-121-1/+1
| * vc-checkout: Try to use the vc-dir's backend firstDmitry Gutov2023-04-111-1/+1
* | Merge from origin/emacs-29Stefan Kangas2023-03-011-1/+4
|\ \ | |/
| * ; Add a doc string for 'ediff-window-display-p' obsolescenceEli Zaretskii2023-02-281-1/+4
* | Merge from origin/emacs-29Stefan Kangas2023-02-241-16/+38
|\ \ | |/
| * Improve documentation of VC commands, including in DiredEli Zaretskii2023-02-231-16/+38
* | Use delete-char instead of backward-delete-charMattias Engdegård2023-02-221-1/+1
* | New option 'diff-ignore-whitespace-switches'Robert Pluim2023-02-151-1/+12
* | Teach 'diff-ignore-whitespace-hunk' how to regenerate all hunksRobert Pluim2023-02-151-4/+17
* | Merge from origin/emacs-29Stefan Kangas2023-02-081-2/+2
|\ \ | |/
| * * lisp/vc/vc.el (vc-find-revision-no-save): Fix parens (bug#61256).Juri Linkov2023-02-051-2/+2
* | Merge from origin/emacs-29Stefan Kangas2023-01-274-4/+14
|\ \ | |/
| * Handle relative file names in vc-resynch-window and vc-resynch-bufferJuri Linkov2023-01-241-2/+8
| * * lisp/vc/vc-bzr.el (vc-bzr--pushpull): Return buffer's process.Juri Linkov2023-01-243-2/+6
* | Merge from origin/emacs-29Stefan Kangas2023-01-232-22/+14
|\ \ | |/
| * Generalize vc-pull-and-push to support more backends (bug#60569)Juri Linkov2023-01-222-22/+14
* | Merge from origin/emacs-29Stefan Kangas2023-01-191-2/+6
|\ \ | |/
| * * lisp/vc/vc-dir.el: Make keys ‘% m’ and ‘* %’ compatible with DiredJuri Linkov2023-01-181-2/+6
* | Merge from origin/emacs-29Stefan Kangas2023-01-101-6/+8
|\ \ | |/
| * * lisp/vc/diff-mode.el (diff-font-lock-keywords): Check for limit.Juri Linkov2023-01-091-6/+8
* | Merge from origin/emacs-29Stefan Kangas2023-01-041-3/+10
|\ \ | |/
| * * lisp/vc/vc-git.el (vc-git-checkin): Pass vc-git-diff-switches.Sean Whitton2023-01-021-3/+10
* | Data argument to `signal` should be a listMattias Engdegård2023-01-031-1/+1
* | Merge from origin/emacs-29Eli Zaretskii2023-01-0139-39/+39
|\ \ | |/
| * ; Add 2023 to copyright years.Eli Zaretskii2023-01-0139-39/+39
* | Merge from origin/emacs-29Eli Zaretskii2023-01-011-1/+1
|\ \ | |/
| * ; Fix typosStefan Kangas2022-12-311-1/+1
* | vc-git-dir-extra-headers: Improve detection of rebasesSean Whitton2022-12-311-3/+22
* | vc-git: Don't assume .git is a directorySean Whitton2022-12-311-6/+22
* | Merge from origin/emacs-29Stefan Kangas2022-12-281-2/+1
|\ \ | |/
| * * lisp/vc/diff-mode.el (diff-minor-mode-prefix): Replace "ESC" with "\e".Juri Linkov2022-12-281-2/+1
| * vc-git-checkin: Don't try to apply an empty patchSean Whitton2022-12-221-6/+7
* | vc-git-checkin: Stash other staged changesSean Whitton2022-12-231-14/+83
* | vc-git-checkin: Don't try to apply an empty patchSean Whitton2022-12-201-6/+7
* | vc-git-checkin: Offer to unstage conflicting changesSean Whitton2022-12-201-12/+20
* | ; * lisp/vc/vc.el (vc-prepare-patch): Fix typo.Sean Whitton2022-12-191-1/+1
* | vc-prepare-patch: Number the attached patchesSean Whitton2022-12-191-6/+25
* | Use equal and member instead of eq and memqMattias Engdegård2022-12-191-1/+2
* | Merge from origin/emacs-29Stefan Kangas2022-12-191-2/+1
|\ \ | |/
| * Revert "Use equal and member instead of eq and memq"Eli Zaretskii2022-12-161-2/+1
| * Use equal and member instead of eq and memqMattias Engdegård2022-12-161-1/+2