aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/git-workflow (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Prefer straight quoting in some text filesPaul Eggert2015-09-111-1/+1
| | | | | | | | | Mostly this just changes ` to ' in static text. Some exceptions: * INSTALL.REPO: Use curved quotes, as the diagnostic in question typically does that now. * admin/quick-install-emacs (TRY, top level): Use straight quoting in diagnostics. * src/README: Fix working-directory confusion.
* * CONTRIBUTE: Move send-email here from git-workflow.Paul Eggert2015-09-111-12/+2
|
* Add patch-sending instructions to git-workflowPaul Eggert2015-09-101-0/+18
| | | | | | From a suggestion by Mitchel Humpherys in: http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00421.html * admin/notes/git-workflow (Sending patches): New section.
* admin: Add documentation for gitmerge.elDavid Engster2014-11-271-5/+51
| | | | | * gitmerge.el: New file. * notes/git-workflow: Add documentation for using it.
* 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
|
* 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