summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-09-11 08:34:46 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-09-11 08:34:46 -0700
commit279303adfc6d6ba91db788c2b85333e3fc46f39b (patch)
tree3fe9c0b6ca485d35b9549d25c6f250d1c1b40e5a
parenta0ec54ae073abd671bd43002eff0267f5fe8b306 (diff)
downloademacs-279303adfc6d6ba91db788c2b85333e3fc46f39b.tar.gz
* CONTRIBUTE: Move send-email here from git-workflow.
-rw-r--r--CONTRIBUTE4
-rw-r--r--admin/notes/git-workflow14
2 files changed, 5 insertions, 13 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index 7e697ddd89a..5821ee5caca 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -234,7 +234,9 @@ by following links from http://savannah.gnu.org/mail/?group=emacs .
To email a patch you can use a shell command like 'git format-patch -1'
to create a file, and then attach the file to your email. This nicely
-packages the patch's commit message and changes.
+packages the patch's commit message and changes. To send just one
+such patch without additional remarks, you can use a command like
+'git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
** Document your changes.
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 40dfa6b7410..92dc79127e3 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -50,18 +50,8 @@ Sending patches
===============
If you lack push access or would like feedback before pushing a patch,
-you can send a patch file as a bug report. After committing your
-change locally, do:
-
-git format-patch -1
-
-This creates a file 0001-DESCRIPTION.patch containing the patch, where
-DESCRIPTION comes from the first line of your patch's commit message.
-You can attach the patch file to email that you send to
-bug-gnu-emacs@gnu.org. You can also configure git to email patches
-directly (see <http://git-scm.com/docs/git-send-email>) and do:
-
-git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch
+you commit your change locally and then send a patch file as a bug report
+as described in ../../CONTRIBUTE.
Backporting to emacs-24