summaryrefslogtreecommitdiff
path: root/admin
Commit message (Expand)AuthorAgeFilesLines
* Improve CONTRIBUTE and related files.Stephen Leake2014-12-062-162/+0
* Merge from emacs-24Stefan Monnier2014-12-051-14/+11
|\
* | ChangeLog fixGlenn Morris2014-12-011-2/+3
* | ChangeLog fixes.Glenn Morris2014-12-011-4/+8
* | * admin/update_autogen: Fix bogosity introduced in 2014-11-16 merge.Glenn Morris2014-12-012-8/+5
* | Fix up merged ChangeLog entries (dates, duplication, etc)Glenn Morris2014-11-291-7/+1
* | Spelling fix.Paul Eggert2014-11-281-4/+4
* | Merge branch 'emacs-24'.Paul Eggert2014-11-288-50/+51
|\ \ | |/
| * Lessen focus on ChangeLog files, as opposed to change log entries.Paul Eggert2014-11-196-36/+44
| * .gitignore cleanup.Paul Eggert2014-11-172-5/+0
* | admin: Add documentation for gitmerge.elDavid Engster2014-11-272-5/+52
* | admin: Add gitmerge.elDavid Engster2014-11-272-0/+532
* | Merge branch 'emacs-24'Ted Zlatanov2014-11-262-1/+6
|\ \ | |/
| * Define MINGW_W64 and use it instead of _W64Oscar Fuentes2014-11-172-1/+6
* | * admin/admin.el: Fix paren typo in previous.Glenn Morris2014-11-221-9/+9
* | Further reduce number of versioned files storing Emacs version number.Glenn Morris2014-11-223-43/+9
* | Set the push default to "current", which should work everywhereLars Magne Ingebrigtsen2014-11-161-0/+2
* | Mention how to get rid of X11 warningsLars Magne Ingebrigtsen2014-11-161-0/+15
* | Merge from emacs-24Stefan Monnier2014-11-162-7/+22
|\ \ | |/
| * Backport 2014-06-30 admin/update_autogen changeGlenn Morris2014-11-152-6/+28
| * Git transition patchEric S. Raymond2014-11-116-1354/+1042
* | Use cherry-pick -xe instead of git log amendLars Magne Ingebrigtsen2014-11-151-2/+1
* | Add a draft of a very simple git workflowLars Magne Ingebrigtsen2014-11-151-0/+73
* | Use annotated tags for releasesAndreas Schwab2014-11-132-1/+5
* | Git transition patchEric S. Raymond2014-11-117-1391/+1051
* | Merge from emacs-24; up to 117698Glenn Morris2014-11-092-1/+6
|\ \ | |/
| * Fix bug #18955 with failure generating macuvs.h on MS-Windows.Eli Zaretskii2014-11-092-1/+6
* | Further reduce the number of versioned files storing the version numberGlenn Morris2014-11-092-4/+2
* | * admin/admin.el: Comments.Glenn Morris2014-11-091-0/+2
* | ChangeLog fixGlenn Morris2014-11-091-2/+1
* | Stop keeping etc/refcards/emacsver.tex in the repositoryGlenn Morris2014-11-092-4/+4
* | Stop keeping doc/emacs/emacsver.texi in the repositoryGlenn Morris2014-11-092-9/+14
* | Update from CEDET trunk.David Engster2014-11-103-13/+59
* | Merge from emacs-24; up to 117691Glenn Morris2014-11-082-0/+87
|\ \ | |/
| * Replace doc/*/Makefile.in dist rules with code in admin/admin.elGlenn Morris2014-11-082-0/+87
* | Spelling fixes; tweak explanation of commit messages.Paul Eggert2014-11-042-8/+18
* | Merge from emacs-24; up to 117656Glenn Morris2014-11-012-13/+16
|\ \ | |/
| * admin/ChangeLog: Fix a typo.Eli Zaretskii2014-10-311-1/+1
| * Minor fixes in the changes in preparation for git migration.Eli Zaretskii2014-10-312-11/+14
| * Backport from trunk more changes in preparation for git migration.Eric S. Raymond2014-10-312-26/+54
| * Backport changes in preparation for git migration from trunk.Eric S. Raymond2014-10-317-43/+48
* | Guidance on commit-comment formats.Eric S. Raymond2014-10-262-1/+20
* | More preparation for git tramsition. Reorganize to sparate our dependencies.Eric S. Raymond2014-10-262-26/+35
* | Merge BRANCH into repo, because it belongs with the developer advice. Also...Eric S. Raymond2014-10-262-32/+36
* | Neutralize some language specific to a repository type.Eric S. Raymond2014-10-261-1/+1
* | Rename the 'bzr' notes file to 'repo'. For two reasons:Eric S. Raymond2014-10-261-1/+1
* | Looking for .bzr as a check for top-level directory will soon be a bad idea.Eric S. Raymond2014-10-251-1/+1
* | Preparing foe git transition.Eric S. Raymond2014-10-251-2/+3
* | Neutralize language specific to a repository type.Eric S. Raymond2014-10-251-1/+1
* | Preparing for git transition; replace bzr-specific language.Eric S. Raymond2014-10-251-5/+5
View Lorry Controller Status