aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/git-workflow (unfollow)
Commit message (Collapse)AuthorFilesLines
2022-12-22; * admin/notes/git-workflow: Adding "Backport:" is optional.Sean Whitton1-1/+1
2022-12-09* admin/notes/git-workflow: Replace emacs-28 by emacs-29 branch.Michael Albinus1-4/+4
2021-10-13Change release branch to emacs-28Paul Eggert1-4/+4
* admin/notes/git-workflow: * Makefile.in (PREFERRED_BRANCH): emacs-27 → emacs-28
2021-01-31; emacs-26 → emacs-27Stefan Kangas1-10/+10
2020-05-03; admin/notes/git-workflowGlenn Morris1-0/+11
Mention reverting on release branch.
2020-05-03; admin/notes/git-workflowGlenn Morris1-12/+13
Prefer "release branch" to a specific branch that can only ever get outdated.
2019-07-28* admin/notes/git-workflow: Replace git-new-workdir with gitAndreas Schwab1-8/+3
worktree and remove draft marker.
2017-11-25maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert1-1/+1
2017-09-25emacs-25 → emacs-26Paul Eggert1-12/+12
* admin/gitmerge.el (gitmerge-default-branch): Now emacs-26.
2016-02-14CONTRIBUTE cleanups and updatesPaul Eggert1-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.
2016-02-01Recommend enabling integrity-checking in gitKarl Fogel1-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.
2015-09-11Prefer straight quoting in some text filesPaul Eggert1-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.
2015-09-11* CONTRIBUTE: Move send-email here from git-workflow.Paul Eggert1-12/+2
2015-09-10Add patch-sending instructions to git-workflowPaul Eggert1-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.
2014-11-27admin: Add documentation for gitmerge.elDavid Engster1-5/+51
* gitmerge.el: New file. * notes/git-workflow: Add documentation for using it.
2014-11-16Set the push default to "current", which should work everywhereLars Magne Ingebrigtsen1-0/+2
2014-11-16Mention how to get rid of X11 warningsLars Magne Ingebrigtsen1-0/+15
2014-11-15Use cherry-pick -xe instead of git log amendLars Magne Ingebrigtsen1-2/+1
2014-11-15Add a draft of a very simple git workflowLars Magne Ingebrigtsen1-0/+73
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-06 23:01:35 +0000