summaryrefslogtreecommitdiff
path: root/admin/notes/git-workflow
Commit message (Collapse)AuthorAgeFilesLines
* CONTRIBUTE cleanups and updatesPaul Eggert2016-02-141-19/+17
| | | | | | | | | | | | | * CONTRIBUTE: Mention URLs and info nodes more consistently, avoiding possibly-confusing punctuation adjacent to a URL, and giving full shell commands for 'info'. Start with a brief but complete how-to, for people who want to get started right away. Then briefly discuss how to join the development process in the typical order. Omit needless words. Update some of the now-obsolete file names, info node names, and quoting styles. Better document emacs-NN branches and how they are merged. * admin/notes/git-workflow: Change emacs-24 to emacs-25, and trunk to master. This file still needs work.
* Recommend enabling integrity-checking in gitKarl Fogel2016-02-011-0/+5
| | | | | | | | | | | * admin/notes/git-workflow: Recommend setting transfer.fsckObjects. This is related to the autogen.sh changes made by Paul Eggert in commit d766ca8f (2016-02-01) and commit cedd7cad (2016-02-01), and to my edits today to http://www.emacswiki.org/emacs/GitForEmacsDevs and to emacswiki.org/emacs/GitQuickStartForEmacsDevs. See also the thread "Recommend these .gitconfig settings for git integrity." at https://lists.gnu.org/archive/html/emacs-devel/2016-01/threads.html#01802.
* 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