aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc (follow)
Commit message (Expand)AuthorAgeFilesLines
* Require cl-lib at runtime in vc-hgGöktuğ Kayaalp2017-05-041-1/+2
* vc-git-state: Return `ignored' as appropriate with newer GitDmitry Gutov2017-05-011-14/+22
* vc-git-state: Bring back CentOS 6 compatibilityDmitry Gutov2017-05-011-1/+20
* Speed up vc-git-status and make it more preciseJonathan Ganc2017-05-011-26/+49
* Fix Git revision navigation in currently removed directoriesDmitry Gutov2017-05-011-3/+2
* * lisp/vc/vc-hg.el (vc-hg-state-fast): Fix compiler warningStefan Monnier2017-04-201-10/+3
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-179-104/+54
* Default to PCRE syntax when reading .hgignoreJim Blandy2017-04-101-1/+1
* Remove references to OS/2 in code, doc, and commentsGlenn Morris2017-04-081-10/+8
* Check that file argument is a stringKaushal Modi2017-04-071-7/+16
* Make ediff handle remote and quoted file namesPhilipp Stephani2017-04-041-1/+5
* epatch: Save right backups in Git multipatchesTino Calancha2017-03-212-8/+7
* Merge from origin/emacs-25Paul Eggert2017-03-191-1/+1
|\
| * ; Fix a typo in commentTino Calancha2017-02-101-1/+1
* | Merge from origin/emacs-25Paul Eggert2017-03-191-1/+1
|\ \ | |/
| * ; Fix a typo in ediff-merg.elTino Calancha2017-01-211-1/+1
* | Show ancestor buffer in 3way mergesTino Calancha2017-03-144-67/+186
* | diff-mode: Improve default faces for buffer ancestorTino Calancha2017-03-141-14/+22
* | Replace change-log-date-face -> change-log-dateSam Steingold2017-03-083-3/+3
* | * lisp/vc/add-log.el (change-log-next-buffer): Check if file existsJuri Linkov2017-02-281-8/+10
* | Add more branch support to vc-dirTom Tromey2017-02-252-1/+21
* | Use revision-completion-table in vc-retrieve-tagDmitry Gutov2017-02-221-11/+15
* | vc-log-outgoing fixes for git; add binding to vc-dirTom Tromey2017-02-193-7/+8
* | Remove stale comments from vc-git and vc-hgTom Tromey2017-02-192-5/+2
* | Fix buffers update in vc-retrieve-tagDmitry Gutov2017-02-171-2/+4
* | Make vc-git detect conflict state for vc-dirTom Tromey2017-02-141-69/+110
* | Check if there are hunks before kill or refine a hunkTino Calancha2017-02-021-74/+85
* | Ignore error after kill last file or hunkTino Calancha2017-02-021-2/+3
* | Handle patch terminators produced by git and bzr patch exportDima Kogan2017-01-311-9/+17
* | Fix Bug#25524Tino Calancha2017-01-291-2/+4
* | ediff-difference-vector-alist: Drop duplicated definitionTino Calancha2017-01-251-26/+20
* | diff-hunk-kill independent of point inside headersTino Calancha2017-01-211-18/+49
* | ; Revert "Improve diff-mode navigation/manipulation"Tino Calancha2017-01-211-140/+34
* | Avoid inefficient regex in diff-refine-hunk (Bug#25410)Noam Postavsky2017-01-181-10/+21
* | Remove leftover references to log-view-message-faceDmitry Gutov2017-01-143-4/+4
* | Merge from origin/emacs-25Paul Eggert2017-01-0140-40/+40
|\ \ | |/
| * Update copyright year to 2017Paul Eggert2016-12-3140-40/+40
* | Merge from origin/emacs-25Paul Eggert2017-01-012-1/+3
|\ \ | |/
| * ; Add missing symbol quoting.Philipp Stephani2016-12-181-1/+1
| * Doc fix for vc-gitGlenn Morris2016-12-071-0/+2
* | diff-mode auto-refines only after a successful motionDima Kogan2016-12-241-18/+21
* | diff-mode is able to better handle file headersDima Kogan2016-12-241-1/+1
* | ; Spelling fixesPaul Eggert2016-12-223-6/+6
* | ediff-fixup-patch-map: Improve promptTino Calancha2016-12-081-4/+17
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+2
|\ \ | |/
| * ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. (Bug#25046)Eli Zaretskii2016-12-021-1/+1
| * * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)Eli Zaretskii2016-12-021-0/+2
* | ediff-context-diff-label-regexp: Detect the end of second fileTino Calancha2016-12-071-5/+6
* | Make "g" in vc push/pull buffers re-push/pullGlenn Morris2016-12-063-3/+17
* | Fix previous commitNoam Postavsky2016-11-291-5/+4