aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2017-11-24 10:03:39 +0200
committerArnold D. Robbins <arnold@skeeve.com>2017-11-24 10:03:39 +0200
commit03caf83ac9d2862ca72daa5d18f2af27d68db1d4 (patch)
treef3996d2249d332920cf4ce31efa025fab19be6e3 /doc
parentb7b2c08b9d42630135f5a442dab69402fba86b73 (diff)
downloadegawk-03caf83ac9d2862ca72daa5d18f2af27d68db1d4.tar.gz
egawk-03caf83ac9d2862ca72daa5d18f2af27d68db1d4.tar.bz2
egawk-03caf83ac9d2862ca72daa5d18f2af27d68db1d4.zip
Fix wrong option in gawkworkflow.texi.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gawkworkflow.info36
-rw-r--r--doc/gawkworkflow.texi6
3 files changed, 26 insertions, 21 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 792736cb..761b4da8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-24 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawkworkflow.texi (General practices): Use correct option
+ --delete for deleting a branch upstream, instead of -d.
+
2017-11-21 Andrew J. Schorr <aschorr@telemetry-investments.com>
* gawktexi.in (Setting the Rounding Mode): Fix the description
diff --git a/doc/gawkworkflow.info b/doc/gawkworkflow.info
index 88240ba6..35b8bebd 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 f9ec2088..88d5e5db 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} master@ii{, 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} master@ii{, 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 @code{@var{xxx}}.
@item git push
Push commits from your local tracking branch @code{@var{xxx}}
through @code{origin/@var{xxx}} and on to branch @code{@var{xxx}}
-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