summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-git.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Work around the asynchronous-empty-diff problemDmitry Gutov2015-11-221-2/+2
* When VC detects a conflict, specify which fileKarl Fogel2015-11-091-1/+1
* ; Revert "Don't declare vc-exec-after anymore"Dmitry Gutov2015-10-281-0/+2
* Call vc-dir-defresh after stash operationsDmitry Gutov2015-10-201-2/+6
* Don't declare vc-exec-after anymoreDmitry Gutov2015-10-201-2/+0
* * lisp/vc/vc-git.el (vc-git-region-history): Handle local changesStefan Monnier2015-10-021-0/+28
* Resurrect the ability to specify a revision in vc-next-actionEli Zaretskii2015-09-191-1/+1
* vc-git-mode-line-string: Explicitly re-apply the faceDmitry Gutov2015-09-031-1/+3
* Make vc-git-working-revision always return the commit hashDmitry Gutov2015-09-011-13/+17
* Address some compilation warnings.Glenn Morris2015-06-161-2/+2
* Improve handling of the first Git revisionDmitry Gutov2015-05-181-7/+12
* Display shorter dates in Git annotate outputDmitry Gutov2015-05-171-3/+5
* Use `unless' to have one fewer `not'Dmitry Gutov2015-05-161-8/+6
* Remove redundant :group declarations from vc-git.elDmitry Gutov2015-05-161-9/+4
* Add new option vc-git-resolve-conflictsDmitry Gutov2015-05-161-7/+25
* Add basic VC push support.Glenn Morris2015-05-121-8/+20
* Function declaration updates prompted by 'make check-declare'Glenn Morris2015-04-301-1/+1
* Add or reset based on the presence of MERGE_HEADDmitry Gutov2015-04-221-21/+22
* Call `smerge-start-session' even when dealing with a stash conflictDmitry Gutov2015-04-191-15/+20
* Abort when looking at stashed changesDmitry Gutov2015-04-191-1/+3
* Use vc-switches on vc-*-annotate-commandOscar Fuentes2015-02-261-1/+13
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-271-4/+3
|\
| * Fix vc-git-dir-status-files WRT up-to-date vs editedDmitry Gutov2014-12-151-4/+3
* | Move VC diff ASYNC argument to the fifth positionDmitry Gutov2014-12-141-2/+2
* | latest-on-branch-p is no longer a public methodEric S. Raymond2014-12-111-1/+0
* | Remove VC rollback method.Eric S. Raymond2014-12-111-1/+0
* | In vc, abolish the dir-status method.Eric S. Raymond2014-12-021-7/+2
* | Eliminate an unuted function argument.Eric S. Raymond2014-12-021-2/+2
* | Remove clear-headers from VC's public method set.Eric S. Raymond2014-12-011-1/+0
* | Update the git backend's header comment.Eric S. Raymond2014-12-011-2/+4
* | Remove could-register from the set of public VC backend methods,Eric S. Raymond2014-12-011-1/+0
* | Terminate vc-disable-async-diff with extreme prejudice.Eric S. Raymond2014-12-011-2/+4
* | * lisp/vc: Fix use of find-conflicted-file in Git.Stefan Monnier2014-12-011-1/+1
* | Update some documentation changes and todo items.Eric S. Raymond2014-12-011-2/+0
* | Remove vc-state-heuristic from the set of public methods.Eric S. Raymond2014-12-011-1/+0
* | API simplification: remove vc-workfile-unchanged-p from pubic methods.Eric S. Raymond2014-12-011-4/+0
* | VC API simplification: remove ability to set initial revision.Eric S. Raymond2014-12-011-1/+1
* | Merge branch 'emacs-24'.Paul Eggert2014-11-281-11/+19
|\ \ | |/
| * Use "~1" instead of "^" in vc-git.el to specify the parent of a Git commit.Eli Zaretskii2014-11-211-1/+5
| * Use correct encoding to communicate with Git.Eli Zaretskii2014-11-211-10/+14
* | Remove editable argument from VC's backend checkout methods.Eric S. Raymond2014-11-201-2/+2
* | Remove never-used rev argument from VC's backend checkin methods.Eric S. Raymond2014-11-201-1/+1
* | vc-git: Support `diff-switches'.Rüdiger Sonderfeld2014-11-191-5/+12
* | * lisp/vc/vc/git.el: Fix previous.Glenn Morris2014-11-051-46/+48
* | * lisp/vc/vc.el (vc-region-history): New command.Stefan Monnier2014-11-051-1/+47
* | * lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git statusRasmus Pank Roulund2014-09-041-1/+1
* | * vc-git.el: Comments.Glenn Morris2014-08-251-0/+4
* | Add smerge support to the git back end.Eric S. Raymond2014-08-131-1/+21
View Lorry Controller Status