[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2840-g03caf83

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.2-stable has been updated
       via  03caf83ac9d2862ca72daa5d18f2af27d68db1d4 (commit)
      from  b7b2c08b9d42630135f5a442dab69402fba86b73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=03caf83ac9d2862ca72daa5d18f2af27d68db1d4

commit 03caf83ac9d2862ca72daa5d18f2af27d68db1d4
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Nov 24 10:03:39 2017 +0200

    Fix wrong option in gawkworkflow.texi.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 792736c..761b4da 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-24         Arnold D. Robbins     <address@hidden>
+
+       * gawkworkflow.texi (General practices): Use correct option
+       --delete for deleting a branch upstream, instead of -d.
+
 2017-11-21         Andrew J. Schorr     <address@hidden>
 
        * gawktexi.in (Setting the Rounding Mode): Fix the description
diff --git a/doc/gawkworkflow.info b/doc/gawkworkflow.info
index 88240ba..35b8beb 100644
--- a/doc/gawkworkflow.info
+++ b/doc/gawkworkflow.info
@@ -1281,8 +1281,8 @@ feature branch.
      Since 'feature/python' is no longer needed, it can be gotten rid
      of:
 
-          $ git branch -d feature/python           Still on master, delete 
feature branch
-          $ git push -u origin -d feature/python   Delete the branch on 
Savannah
+          $ git branch -d feature/python                 Still on master, 
delete feature branch
+          $ git push -u origin --delete feature/python   Delete the branch on 
Savannah
 
      The 'git push' command deletes the 'feature/python' branch from the
      Savannah repo.
@@ -1648,7 +1648,7 @@ given Git command.
 'git push'
      Push commits from your local tracking branch 'XXX' through
      'origin/XXX' and on to branch 'XXX' in the upstream repo.  Use 'git
-     push -u origin -d XXX' to delete an upstream branch.  (Do so
+     push -u origin --delete XXX' to delete an upstream branch.  (Do so
      carefully!)
 
 'git rebase'
@@ -1961,20 +1961,20 @@ Node: Developing patches44628
 Node: Developing new features45964
 Node: Developing fixes47868
 Node: General practices48955
-Node: Repo Maintenance53685
-Ref: Repo Maintenance-Footnote-156454
-Node: Development Stuff56587
-Node: Coding style57150
-Ref: Coding style-Footnote-157808
-Node: Doing paperwork57898
-Node: Tools58693
-Node: GNU Tools59275
-Node: Compilers61436
-Ref: Compilers-Footnote-163930
-Node: Debugging63968
-Node: Cheat Sheet64674
-Node: Resources68355
-Node: TODO68798
-Node: Index69018
+Node: Repo Maintenance53697
+Ref: Repo Maintenance-Footnote-156466
+Node: Development Stuff56599
+Node: Coding style57162
+Ref: Coding style-Footnote-157820
+Node: Doing paperwork57910
+Node: Tools58705
+Node: GNU Tools59287
+Node: Compilers61448
+Ref: Compilers-Footnote-163942
+Node: Debugging63980
+Node: Cheat Sheet64686
+Node: Resources68373
+Node: TODO68816
+Node: Index69036
 
 End Tag Table
diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi
index f9ec208..88d5e5d 100644
--- a/doc/gawkworkflow.texi
+++ b/doc/gawkworkflow.texi
@@ -1682,8 +1682,8 @@ gotten rid of:
 @cindex @code{git branch}
 @cindex @code{git push}
 @example
-$ @kbd{git branch -d feature/python}           @ii{Still on} address@hidden, 
delete feature branch}
-$ @kbd{git push -u origin -d feature/python}   @ii{Delete the branch on 
Savannah}
+$ @kbd{git branch -d feature/python}                 @ii{Still on} 
address@hidden, delete feature branch}
+$ @kbd{git push -u origin --delete feature/python}   @ii{Delete the branch on 
Savannah}
 @end example
 
 The @samp{git push} command deletes the @code{feature/python}
@@ -2104,7 +2104,7 @@ into @address@hidden
 @item git push
 Push commits from your local tracking branch @address@hidden
 through @code{origin/@var{xxx}} and on to branch @address@hidden
-in the upstream repo. Use @samp{git push -u origin -d @var{xxx}} to delete
+in the upstream repo. Use @samp{git push -u origin --delete @var{xxx}} to 
delete
 an upstream branch. (Do so carefully!)
 
 @item git rebase

-----------------------------------------------------------------------

Summary of changes:
 doc/ChangeLog         |  5 +++++
 doc/gawkworkflow.info | 36 ++++++++++++++++++------------------
 doc/gawkworkflow.texi |  6 +++---
 3 files changed, 26 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
gawk