summaryrefslogtreecommitdiff
path: root/admin/notes/git-workflow
Commit message (Collapse)AuthorAgeFilesLines
* ; * admin/notes/git-workflow: Adding "Backport:" is optional.Sean Whitton2022-12-221-1/+1
|
* Change release branch to emacs-28Paul Eggert2021-10-131-4/+4
| | | | | * admin/notes/git-workflow: * Makefile.in (PREFERRED_BRANCH): emacs-27 → emacs-28
* ; admin/notes/git-workflowGlenn Morris2020-05-031-0/+11
| | | | Mention reverting on release branch.
* ; admin/notes/git-workflowGlenn Morris2020-05-031-12/+13
| | | | Prefer "release branch" to a specific branch that can only ever get outdated.
* * admin/notes/git-workflow: Replace git-new-workdir with gitAndreas Schwab2019-07-281-8/+3
| | | | worktree and remove draft marker.
* Merge from origin/emacs-26Paul Eggert2017-11-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a89f0b6f33 maint: shorten https://lists.gnu.org/archive/html/... links 8be3aee281 Merge from Gnulib 265cee553f Work around GCC bug 80776 on Fedora 27 x86 dc7a97fb84 Tweak copy-file, rename-file doc cfa2a944d4 Change font-lock-extend-region-multiline handling in mhtml... a8664cc998 Minor cleanup in tramp-gvfs-handle-file-local-copy 55c5b12fa0 Add test for Bug#29423 in Tramp. 3198a1646e Avoid jumbled order in HTML rendered by shr.el 23bfc2d2db Make sure 'dired-filename' property is always put by ls-lisp f7fdaea4c0 A better solution for bug#29347 86e6ed8521 ; * src/thread.c (acquire_global_lock): Fix thinko in last... f300852037 Avoid a hang after C-g while sit-for on a Unix TTY d7fc719ff1 Improve the doc string of 'list-packages' b4f67ebb92 Improve discoverability of 'defvar' for suppressing warnings 8a2b204e64 Improve discoverability of 'read-buffer-completion-ignore-... eea4e9194c Improve documentation of self-insert-uses-region-functions e6e41dac87 Reflect changes in copy-file and rename-file in doc strings 0ec534070f * lisp/progmodes/cc-vars.el (c-offsets-alist): Doc fix. (... 1d0dbdff6c Reorder type predicates in ELisp manual b081ec9dd7 Fix backward scrolling in buffers with header-line 8e40429c96 ; Fix some doc typos ed2c542920 * lisp/bindings.el (buffer-file-coding-system): Add explic... d82474e452 * src/fns.c (syms_of_fns) <overriding-plist-environment>: ... 292c09ff6d Fix incorrect interaction of drag/drop and double click (b... d6fadb1d26 * lisp/menu-bar.el (menu-bar-options-save): Add display-li... daa959efbc * lisp/menu-bar.el (menu-bar-options-save): Add global-dis... 17fc74d1b9 * lisp/follow.el (follow-mode): Restore mode line lighter.... f20c2e2f3d ; Compare process status against 127 exactly 2d203ffb7e Extract the common part of ruby-flymake-simple and ruby-fl... 09944d499a Add Rubocop Flymake backend c65a0ae7c4 ; Fix a typo 7ab7603125 Update nt/INSTALL.W64 (Bug#28601) 11db253c08 Remove incorrect NEWS item about VC state indicator (Bug#2... 2fdc01c036 * lisp/emacs-lisp/byte-run.el (defsubst): Doc fix. 735c8b516e Make c-defun-name analyze more thoroughly a function type ... 92f0c4cd56 Avoid bogus abbreviated file names if HOME changes 8d450453fa * lisp/emacs-lisp/byte-run.el (inline): Give it a doc. 37a3b4ea40 Fix erc keep-place module with new defaults (Bug#29111) 6c312605bf Add window divider faces to NS (bug#29353) # Conflicts: # etc/NEWS # lisp/ruler-mode.el
| * maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert2017-11-251-1/+1
| |
* | emacs-25 → emacs-26Paul Eggert2017-09-251-12/+12
|/ | | | * admin/gitmerge.el (gitmerge-default-branch): Now emacs-26.
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 06:02:04 +0000