diff options
| author | K. Handa <handa@gnu.org> | 2015-09-27 17:06:12 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-09-27 17:06:12 +0900 |
| commit | 52beda922d2cb523a03661bf74b8678c8b45e440 (patch) | |
| tree | 04617b37298746a61d5324a5b35c9b71f439d762 /admin/notes/git-workflow | |
| parent | 94ed5167557112fb00eeca05e62589db744206de (diff) | |
| parent | 1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff) | |
| download | emacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'admin/notes/git-workflow')
| -rw-r--r-- | admin/notes/git-workflow | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index d1d105a8a7a..3c2c76c8909 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow @@ -33,7 +33,7 @@ You now have both branches conveniently accessible, and you can do Fixing bugs =========== -You edit the files in either branch, `M-x vc-dir', and check in your +You edit the files in either branch, 'M-x vc-dir', and check in your changes. Then you need to push the data to the main repository. This will usually fail, since somebody else has pushed other changes in the meantime. To fix this, say @@ -46,6 +46,14 @@ top of that. Then say git push +Sending patches +=============== + +If you lack push access or would like feedback before pushing a patch, +you commit your change locally and then send a patch file as a bug report +as described in ../../CONTRIBUTE. + + Backporting to emacs-24 ======================= |