-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Updates git-squash.md: fixes help which was unclear and had remnants … #884
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c41f016
Updates git-squash.md: fixes help which was unclear and had remnants …
elonderin 35d44c9
Merge remote-tracking branch 'u/master' into HEAD
elonderin da34968
squash help: corrects option name in PR
elonderin 35d544b
squash help: ran make man/git-squash.{html,1}
elonderin 041e3fd
squash help: ran make man/git-extras.{html,1}
elonderin 6d9f861
squash help: re-ran make for extras and squash
elonderin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,194 +0,0 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta http-equiv='content-type' value='text/html;charset=utf8'> | ||
| <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'> | ||
| <title>git-extras(1) - Awesome GIT utilities</title> | ||
| <style type='text/css' media='all'> | ||
| /* style: man */ | ||
| body#manpage {margin:0} | ||
| .mp {max-width:100ex;padding:0 9ex 1ex 4ex} | ||
| .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0} | ||
| .mp h2 {margin:10px 0 0 0} | ||
| .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex} | ||
| .mp h3 {margin:0 0 0 4ex} | ||
| .mp dt {margin:0;clear:left} | ||
| .mp dt.flush {float:left;width:8ex} | ||
| .mp dd {margin:0 0 0 9ex} | ||
| .mp h1,.mp h2,.mp h3,.mp h4 {clear:left} | ||
| .mp pre {margin-bottom:20px} | ||
| .mp pre+h2,.mp pre+h3 {margin-top:22px} | ||
| .mp h2+pre,.mp h3+pre {margin-top:5px} | ||
| .mp img {display:block;margin:auto} | ||
| .mp h1.man-title {display:none} | ||
| .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143} | ||
| .mp h2 {font-size:16px;line-height:1.25} | ||
| .mp h1 {font-size:20px;line-height:2} | ||
| .mp {text-align:justify;background:#fff} | ||
| .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211} | ||
| .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201} | ||
| .mp u {text-decoration:underline} | ||
| .mp code,.mp strong,.mp b {font-weight:bold;color:#131211} | ||
| .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none} | ||
| .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff} | ||
| .mp b.man-ref {font-weight:normal;color:#434241} | ||
| .mp pre {padding:0 4ex} | ||
| .mp pre code {font-weight:normal;color:#434241} | ||
| .mp h2+pre,h3+pre {padding-left:0} | ||
| ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px} | ||
| ol.man-decor {width:100%} | ||
| ol.man-decor li.tl {text-align:left} | ||
| ol.man-decor li.tc {text-align:center;letter-spacing:4px} | ||
| ol.man-decor li.tr {text-align:right;float:right} | ||
| </style> | ||
| </head> | ||
| <!-- | ||
| The following styles are deprecated and will be removed at some point: | ||
| div#man, div#man ol.man, div#man ol.head, div#man ol.man. | ||
| The .man-page, .man-decor, .man-head, .man-foot, .man-title, and | ||
| .man-navigation should be used instead. | ||
| --> | ||
| <body id='manpage'> | ||
| <div class='mp' id='man'> | ||
|
|
||
| <div class='man-navigation' style='display:none'> | ||
| <a href="#NAME">NAME</a> | ||
| <a href="#SYNOPSIS">SYNOPSIS</a> | ||
| <a href="#OPTIONS">OPTIONS</a> | ||
| <a href="#ENVIRONMENT-AND-CONFIGURATION-VARIABLES">ENVIRONMENT AND CONFIGURATION VARIABLES</a> | ||
| <a href="#COMMANDS">COMMANDS</a> | ||
| <a href="#AUTHOR">AUTHOR</a> | ||
| <a href="#REPORTING-BUGS">REPORTING BUGS</a> | ||
| <a href="#SEE-ALSO">SEE ALSO</a> | ||
| </div> | ||
|
|
||
| <ol class='man-decor man-head man head'> | ||
| <li class='tl'>git-extras(1)</li> | ||
| <li class='tc'>Git Extras</li> | ||
| <li class='tr'>git-extras(1)</li> | ||
| </ol> | ||
|
|
||
| <h2 id="NAME">NAME</h2> | ||
| <p class="man-name"> | ||
| <code>git-extras</code> - <span class="man-whatis">Awesome GIT utilities</span> | ||
| </p> | ||
|
|
||
| <h2 id="SYNOPSIS">SYNOPSIS</h2> | ||
|
|
||
| <p><code>git-extras</code> [-v,--version] [-h,--help] [update]</p> | ||
|
|
||
| <h2 id="OPTIONS">OPTIONS</h2> | ||
|
|
||
| <p> -v, --version</p> | ||
|
|
||
| <p> Show git-extras version number.</p> | ||
|
|
||
| <p> -h, --help</p> | ||
|
|
||
| <p> Show this help. This option can also be used for any of the extras commands.</p> | ||
|
|
||
| <p> update</p> | ||
|
|
||
| <p> Self update.</p> | ||
|
|
||
| <h2 id="ENVIRONMENT-AND-CONFIGURATION-VARIABLES">ENVIRONMENT AND CONFIGURATION VARIABLES</h2> | ||
|
|
||
| <p> <code>git config --add git-extras.default-branch $BRANCH</code></p> | ||
|
|
||
| <p> Change the default branch to <code>$BRANCH</code> (defaut to <code>master</code>).</p> | ||
|
|
||
| <h2 id="COMMANDS">COMMANDS</h2> | ||
|
|
||
| <ul> | ||
| <li> <strong><a class="man-ref" href="git-alias.html">git-alias<span class="s">(1)</span></a></strong> Define, search and show aliases</li> | ||
| <li> <strong><a class="man-ref" href="git-archive-file.html">git-archive-file<span class="s">(1)</span></a></strong> Export the current HEAD of the git repository to an archive</li> | ||
| <li> <strong><a class="man-ref" href="git-authors.html">git-authors<span class="s">(1)</span></a></strong> Generate authors report</li> | ||
| <li> <strong><a class="man-ref" href="git-browse.html">git-browse<span class="s">(1)</span></a></strong> <var>View the web page for the current repository</var></li> | ||
| <li> <strong><a class="man-ref" href="git-brv.html">git-brv<span class="s">(1)</span></a></strong> List branches sorted by their last commit date</li> | ||
| <li> <strong><a class="man-ref" href="git-bulk.html">git-bulk<span class="s">(1)</span></a></strong> Run git commands on multiple repositories</li> | ||
| <li> <strong><a class="man-ref" href="git-changelog.html">git-changelog<span class="s">(1)</span></a></strong> Generate a changelog report</li> | ||
| <li> <strong><a class="man-ref" href="git-clear-soft.html">git-clear-soft<span class="s">(1)</span></a></strong> Soft clean up a repository</li> | ||
| <li> <strong><a class="man-ref" href="git-clear.html">git-clear<span class="s">(1)</span></a></strong> Rigorously clean up a repository</li> | ||
| <li> <strong><a class="man-ref" href="git-coauthor.html">git-coauthor<span class="s">(1)</span></a></strong> Add a co-author to the last commit</li> | ||
| <li> <strong><a class="man-ref" href="git-commits-since.html">git-commits-since<span class="s">(1)</span></a></strong> Show commit logs since some date</li> | ||
| <li> <strong><a class="man-ref" href="git-contrib.html">git-contrib<span class="s">(1)</span></a></strong> Show user's contributions</li> | ||
| <li> <strong><a class="man-ref" href="git-count.html">git-count<span class="s">(1)</span></a></strong> Show commit count</li> | ||
| <li> <strong><a class="man-ref" href="git-cp.html">git-cp<span class="s">(1)</span></a></strong> Copy a file keeping its history</li> | ||
| <li> <strong><a class="man-ref" href="git-create-branch.html">git-create-branch<span class="s">(1)</span></a></strong> Create branches</li> | ||
| <li> <strong><a class="man-ref" href="git-delete-branch.html">git-delete-branch<span class="s">(1)</span></a></strong> Delete branches</li> | ||
| <li> <strong><a class="man-ref" href="git-delete-merged-branches.html">git-delete-merged-branches<span class="s">(1)</span></a></strong> Delete merged branches</li> | ||
| <li> <strong><a class="man-ref" href="git-delete-submodule.html">git-delete-submodule<span class="s">(1)</span></a></strong> Delete submodules</li> | ||
| <li> <strong><a class="man-ref" href="git-delete-tag.html">git-delete-tag<span class="s">(1)</span></a></strong> Delete tags</li> | ||
| <li> <strong><a class="man-ref" href="git-delta.html">git-delta<span class="s">(1)</span></a></strong> Lists changed files</li> | ||
| <li> <strong><a class="man-ref" href="git-effort.html">git-effort<span class="s">(1)</span></a></strong> Show effort statistics on file(s)</li> | ||
| <li> <strong><a class="man-ref" href="git-feature.html">git-feature<span class="s">(1)</span></a></strong> Create/Merge feature branch</li> | ||
| <li> <strong><a class="man-ref" href="git-force-clone.html">git-force-clone<span class="s">(1)</span></a></strong> overwrite local repositories with clone</li> | ||
| <li> <strong><a class="man-ref" href="git-fork.html">git-fork<span class="s">(1)</span></a></strong> Fork a repo on github</li> | ||
| <li> <strong><a class="man-ref" href="git-fresh-branch.html">git-fresh-branch<span class="s">(1)</span></a></strong> Create fresh branches</li> | ||
| <li> <strong><a class="man-ref" href="git-gh-pages.html">git-gh-pages<span class="s">(1)</span></a></strong> Create the GitHub Pages branch</li> | ||
| <li> <strong><a class="man-ref" href="git-graft.html">git-graft<span class="s">(1)</span></a></strong> Merge and destroy a given branch</li> | ||
| <li> <strong><a class="man-ref" href="git-guilt.html">git-guilt<span class="s">(1)</span></a></strong> calculate change between two revisions</li> | ||
| <li> <strong><a class="man-ref" href="git-ignore-io.html">git-ignore-io<span class="s">(1)</span></a></strong> Get sample gitignore file</li> | ||
| <li> <strong><a class="man-ref" href="git-ignore.html">git-ignore<span class="s">(1)</span></a></strong> Add .gitignore patterns</li> | ||
| <li> <strong><a class="man-ref" href="git-info.html">git-info<span class="s">(1)</span></a></strong> Returns information on current repository</li> | ||
| <li> <strong><a class="man-ref" href="git-local-commits.html">git-local-commits<span class="s">(1)</span></a></strong> List local commits</li> | ||
| <li> <strong><a class="man-ref" href="git-lock.html">git-lock<span class="s">(1)</span></a></strong> Lock a file excluded from version control</li> | ||
| <li> <strong><a class="man-ref" href="git-locked.html">git-locked<span class="s">(1)</span></a></strong> ls files that have been locked</li> | ||
| <li> <strong><a class="man-ref" href="git-merge-into.html">git-merge-into<span class="s">(1)</span></a></strong> Merge one branch into another</li> | ||
| <li> <strong><a class="man-ref" href="git-merge-repo.html">git-merge-repo<span class="s">(1)</span></a></strong> Merge two repo histories</li> | ||
| <li> <strong><a class="man-ref" href="git-missing.html">git-missing<span class="s">(1)</span></a></strong> Show commits missing from another branch</li> | ||
| <li> <strong><a class="man-ref" href="git-mr.html">git-mr<span class="s">(1)</span></a></strong> Checks out a merge request locally</li> | ||
| <li> <strong><a class="man-ref" href="git-obliterate.html">git-obliterate<span class="s">(1)</span></a></strong> rewrite past commits to remove some files</li> | ||
| <li> <strong><a class="man-ref" href="git-paste.html">git-paste<span class="s">(1)</span></a></strong> Send patches to pastebin for chat conversations</li> | ||
| <li> <strong><a class="man-ref" href="git-pr.html">git-pr<span class="s">(1)</span></a></strong> Checks out a pull request locally</li> | ||
| <li> <strong><a class="man-ref" href="git-psykorebase.html">git-psykorebase<span class="s">(1)</span></a></strong> Rebase a branch with a merge commit</li> | ||
| <li> <strong><a class="man-ref" href="git-pull-request.html">git-pull-request<span class="s">(1)</span></a></strong> Create pull request for GitHub project</li> | ||
| <li> <strong><a class="man-ref" href="git-reauthor.html">git-reauthor<span class="s">(1)</span></a></strong> Rewrite history to change author's identity</li> | ||
| <li> <strong><a class="man-ref" href="git-rebase-patch.html">git-rebase-patch<span class="s">(1)</span></a></strong> Rebases a patch</li> | ||
| <li> <strong><a class="man-ref" href="git-release.html">git-release<span class="s">(1)</span></a></strong> Commit, tag and push changes to the repository</li> | ||
| <li> <strong><a class="man-ref" href="git-rename-branch.html">git-rename-branch<span class="s">(1)</span></a></strong> rename local branch and push to remote</li> | ||
| <li> <strong><a class="man-ref" href="git-rename-remote.html">git-rename-remote<span class="s">(1)</span></a></strong> Rename a remote</li> | ||
| <li> <strong><a class="man-ref" href="git-rename-tag.html">git-rename-tag<span class="s">(1)</span></a></strong> Rename a tag</li> | ||
| <li> <strong><a class="man-ref" href="git-repl.html">git-repl<span class="s">(1)</span></a></strong> git read-eval-print-loop</li> | ||
| <li> <strong><a class="man-ref" href="git-reset-file.html">git-reset-file<span class="s">(1)</span></a></strong> Reset one file</li> | ||
| <li> <strong><a class="man-ref" href="git-root.html">git-root<span class="s">(1)</span></a></strong> show path of root</li> | ||
| <li> <strong><a class="man-ref" href="git-scp.html">git-scp<span class="s">(1)</span></a></strong> Copy files to SSH compatible <code>git-remote</code></li> | ||
| <li> <strong><a class="man-ref" href="git-sed.html">git-sed<span class="s">(1)</span></a></strong> replace patterns in git-controlled files</li> | ||
| <li> <strong><a class="man-ref" href="git-setup.html">git-setup<span class="s">(1)</span></a></strong> Set up a git repository</li> | ||
| <li> <strong><a class="man-ref" href="git-show-merged-branches.html">git-show-merged-branches<span class="s">(1)</span></a></strong> Show merged branches</li> | ||
| <li> <strong><a class="man-ref" href="git-show-tree.html">git-show-tree<span class="s">(1)</span></a></strong> show branch tree of commit history</li> | ||
| <li> <strong><a class="man-ref" href="git-show-unmerged-branches.html">git-show-unmerged-branches<span class="s">(1)</span></a></strong> Show unmerged branches</li> | ||
| <li> <strong><a class="man-ref" href="git-squash.html">git-squash<span class="s">(1)</span></a></strong> Import changes from a branch</li> | ||
| <li> <strong><a class="man-ref" href="git-stamp.html">git-stamp<span class="s">(1)</span></a></strong> Stamp the last commit message</li> | ||
| <li> <strong><a class="man-ref" href="git-standup.html">git-standup<span class="s">(1)</span></a></strong> Recall the commit history</li> | ||
| <li> <strong><a class="man-ref" href="git-summary.html">git-summary<span class="s">(1)</span></a></strong> Show repository summary</li> | ||
| <li> <strong><a class="man-ref" href="git-sync.html">git-sync<span class="s">(1)</span></a></strong> Sync local branch with remote branch</li> | ||
| <li> <strong><a class="man-ref" href="git-touch.html">git-touch<span class="s">(1)</span></a></strong> Touch and add file to the index</li> | ||
| <li> <strong><a class="man-ref" href="git-undo.html">git-undo<span class="s">(1)</span></a></strong> Remove latest commits</li> | ||
| <li> <strong><a class="man-ref" href="git-unlock.html">git-unlock<span class="s">(1)</span></a></strong> Unlock a file excluded from version control</li> | ||
| </ul> | ||
|
|
||
|
|
||
| <h2 id="AUTHOR">AUTHOR</h2> | ||
|
|
||
| <p>Written by Tj Holowaychuk <<a href="mailto:tj@vision-media.ca" data-bare-link="true">tj@vision-media.ca</a>></p> | ||
|
|
||
| <h2 id="REPORTING-BUGS">REPORTING BUGS</h2> | ||
|
|
||
| <p><<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>></p> | ||
|
|
||
| <h2 id="SEE-ALSO">SEE ALSO</h2> | ||
|
|
||
| <p><<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>></p> | ||
|
|
||
|
|
||
| <ol class='man-decor man-foot man foot'> | ||
| <li class='tl'></li> | ||
| <li class='tc'>September 2020</li> | ||
| <li class='tr'>git-extras(1)</li> | ||
| </ol> | ||
|
|
||
| </div> | ||
| </body> | ||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.