Commit graph

19 commits

Author SHA1 Message Date
Sean Whitton
afee71273b Discuss commit log messages on feature branches
* admin/notes/git-workflow (Long-lived feature branches): New
section, discussing commit log messages on feature branches.
2024-08-27 12:22:01 +08:00
Michael Albinus
fbbf3610fd * admin/notes/git-workflow: Replace emacs-28 by emacs-29 branch. 2022-12-09 16:14:56 +01:00
Paul Eggert
396d2d88af Change release branch to emacs-28
* admin/notes/git-workflow:
* Makefile.in (PREFERRED_BRANCH): emacs-27 → emacs-28
2021-10-13 11:18:55 -07:00
Glenn Morris
82c506192b ; admin/notes/git-workflow
Mention reverting on release branch.
2020-05-03 10:21:21 -07:00
Glenn Morris
97146efdc6 ; admin/notes/git-workflow
Prefer "release branch" to a specific branch that can only ever get outdated.
2020-05-03 10:18:04 -07:00
Andreas Schwab
e700fff256 * admin/notes/git-workflow: Replace git-new-workdir with git
worktree and remove draft marker.
2019-07-28 17:44:19 +02:00
Paul Eggert
d20161b25e Merge from origin/emacs-26
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
2017-11-25 22:55:35 -08:00
Paul Eggert
a89f0b6f33 maint: shorten https://lists.gnu.org/archive/html/... links 2017-11-25 22:48:12 -08:00
Paul Eggert
c4e6ff097c emacs-25 → emacs-26
* admin/gitmerge.el (gitmerge-default-branch): Now emacs-26.
2017-09-25 11:12:11 -07:00
Paul Eggert
f8bf1b35bf CONTRIBUTE cleanups and updates
* 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-14 19:25:32 -08:00
Karl Fogel
ee8b466995 Recommend enabling integrity-checking in git
* 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.
2016-02-01 12:46:45 -06:00
Paul Eggert
818f06eaa7 Prefer straight quoting in some text files
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 11:05:12 -07:00
Paul Eggert
279303adfc * CONTRIBUTE: Move send-email here from git-workflow. 2015-09-11 08:34:46 -07:00
Paul Eggert
f962c5d647 Add patch-sending instructions to git-workflow
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.
2015-09-10 02:44:42 -07:00
David Engster
692322388c admin: Add documentation for gitmerge.el
* gitmerge.el: New file.
* notes/git-workflow: Add documentation for using it.
2014-11-27 23:23:48 +01:00
Lars Magne Ingebrigtsen
1af9075908 Set the push default to "current", which should work everywhere 2014-11-16 15:54:12 +01:00
Lars Magne Ingebrigtsen
af19cccc83 Mention how to get rid of X11 warnings 2014-11-16 15:31:20 +01:00
Lars Magne Ingebrigtsen
5fa7b7181a Use cherry-pick -xe instead of git log amend 2014-11-15 19:25:45 +01:00
Lars Magne Ingebrigtsen
788bc73c80 Add a draft of a very simple git workflow 2014-11-15 17:06:34 +01:00