diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-11-24 13:39:52 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-11-24 13:39:52 +0200 |
| commit | 1212cdf9eecdec794f2bd608165762a8b2d59ffb (patch) | |
| tree | b947e2707e9e954d7a5100befccc69d28adf82c8 /doc/gawkworkflow.texi | |
| parent | 3b337ad8f2689554543c38a7ce98d6ec1ebd83c6 (diff) | |
| parent | 03caf83ac9d2862ca72daa5d18f2af27d68db1d4 (diff) | |
| download | egawk-1212cdf9eecdec794f2bd608165762a8b2d59ffb.tar.gz egawk-1212cdf9eecdec794f2bd608165762a8b2d59ffb.tar.bz2 egawk-1212cdf9eecdec794f2bd608165762a8b2d59ffb.zip | |
Merge branch 'gawk-4.2-stable'
Diffstat (limited to 'doc/gawkworkflow.texi')
| -rw-r--r-- | doc/gawkworkflow.texi | 6 |
1 files changed, 3 insertions, 3 deletions
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 |