mirror of
https://github.com/tj/git-extras.git
synced 2026-09-10 15:36:21 -04:00
Merge pull request #533 from Addvilz/add-git-clear-soft-modify-git-clear
Add git clear-soft, modify git clear to indicate explicit removal of files
This commit is contained in:
hemanth.hm
commit
b485aabea0
|
|
@ -4,6 +4,7 @@
|
|||
- [`git authors`](#git-authors)
|
||||
- [`git changelog`](#git-changelog)
|
||||
- [`git clear`](#git-clear)
|
||||
- [`git clear-soft`](#git-clear-soft)
|
||||
- [`git commits-since`](#git-commits-since)
|
||||
- [`git contrib`](#git-contrib)
|
||||
- [`git count`](#git-count)
|
||||
|
|
@ -956,7 +957,11 @@ README.md
|
|||
|
||||
## git clear
|
||||
|
||||
Does a hard reset and deletes all untracked files from the working directory
|
||||
Does a hard reset and deletes all untracked files from the working directory, including those in .gitignore.
|
||||
|
||||
## git clear-soft
|
||||
|
||||
Does a hard reset and deletes all untracked files from the working directory, excluding those in .gitignore.
|
||||
|
||||
## git merge-repo
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
echo "Sure? - This command may delete files that cannot be recovered. [Y/n]"
|
||||
echo "Sure? - This command may delete files that cannot be recovered, including those in .gitignore [Y/n]"
|
||||
read ans
|
||||
if [ "$ans" != "n" ]
|
||||
then git clean -d -f -x && git reset --hard
|
||||
|
|
|
|||
7
bin/git-clear-soft
Executable file
7
bin/git-clear-soft
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
echo "Sure? - This command may delete files that cannot be recovered. Files and directories in .gitignore will be preserved [Y/n]"
|
||||
read ans
|
||||
if [ "$ans" != "n" ]
|
||||
then git clean -d -f && git reset --hard
|
||||
fi
|
||||
35
man/git-clear-soft.1
Normal file
35
man/git-clear-soft.1
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CLEAR\-SOFT" "1" "May 2016" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-clear\-soft\fR \- Soft clean up of a repository
|
||||
.
|
||||
.SH "SYNOPSIS"
|
||||
\fBgit\-clear\-soft\fR
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
Clears the repository to a state that it looks as if it was freshly cloned with the current HEAD, however, preserving all changes that are located in files and directories listed in \.gitignore\. It is a git\-reset \-\-hard together with deletion of all untracked files that reside inside the working directory, excluding those in \.gitignore\.
|
||||
.
|
||||
.SH "EXAMPLES"
|
||||
Clears the repo\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
$ git clear\-soft
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.SH "AUTHOR"
|
||||
Modified version of script written by Daniel \'grindhold\' Brendle <\fIgrindhold@gmx\.net\fR> by Matiss Treinis <\fImrtreinis@gmail\.com\fR>
|
||||
.
|
||||
.SH "REPORTING BUGS"
|
||||
<\fIhttps://github\.com/tj/git\-extras/issues\fR>
|
||||
.
|
||||
.SH "SEE ALSO"
|
||||
<\fIhttps://github\.com/tj/git\-extras\fR>
|
||||
114
man/git-clear-soft.html
Normal file
114
man/git-clear-soft.html
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
<!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-clear-soft(1) - Soft clean up of a repository</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="#DESCRIPTION">DESCRIPTION</a>
|
||||
<a href="#EXAMPLES">EXAMPLES</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-clear-soft(1)</li>
|
||||
<li class='tc'></li>
|
||||
<li class='tr'>git-clear-soft(1)</li>
|
||||
</ol>
|
||||
|
||||
<h2 id="NAME">NAME</h2>
|
||||
<p class="man-name">
|
||||
<code>git-clear-soft</code> - <span class="man-whatis">Soft clean up of a repository</span>
|
||||
</p>
|
||||
|
||||
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
||||
|
||||
<p><code>git-clear-soft</code></p>
|
||||
|
||||
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
||||
|
||||
<p> Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD, however, preserving all changes that are located in files and directories listed in .gitignore. It is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory, excluding those in .gitignore.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
<p> Clears the repo.</p>
|
||||
|
||||
<pre><code>$ git clear-soft
|
||||
</code></pre>
|
||||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Modified version of script written by Daniel 'grindhold' Brendle <<a href="mailto:grindhold@gmx.net" data-bare-link="true">grindhold@gmx.net</a>> by Matiss Treinis <<a href="mailto:mrtreinis@gmail.com" data-bare-link="true">mrtreinis@gmail.com</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'>May 2016</li>
|
||||
<li class='tr'>git-clear-soft(1)</li>
|
||||
</ol>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
30
man/git-clear-soft.md
Normal file
30
man/git-clear-soft.md
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
git-clear-soft(1) -- Soft clean up of a repository
|
||||
================================================
|
||||
|
||||
## SYNOPSIS
|
||||
|
||||
`git-clear-soft`
|
||||
|
||||
## DESCRIPTION
|
||||
|
||||
Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD, however, preserving all changes that are located in files and directories listed in .gitignore. It is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory, excluding those in .gitignore.
|
||||
|
||||
## EXAMPLES
|
||||
|
||||
Clears the repo.
|
||||
|
||||
$ git clear-soft
|
||||
|
||||
## AUTHOR
|
||||
|
||||
Modified version of script written by Daniel 'grindhold' Brendle <<grindhold@gmx.net>> by Matiss Treinis <<mrtreinis@gmail.com>>
|
||||
|
||||
## REPORTING BUGS
|
||||
|
||||
<<https://github.com/tj/git-extras/issues>>
|
||||
|
||||
## SEE ALSO
|
||||
|
||||
<<https://github.com/tj/git-extras>>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "GIT\-CLEAR" "1" "December 2015" "" ""
|
||||
.TH "GIT\-CLEAR" "1" "May 2016" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBgit\-clear\fR \- Rigorously clean up a repository
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
\fBgit\-clear\fR
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
Clears the repository to a state that it looks as if it was freshly cloned with the current HEAD\. Basically it is a git\-reset \-\-hard together with deletion of all untracked files that reside inside the working directory\.
|
||||
Clears the repository to a state that it looks as if it was freshly cloned with the current HEAD\. Basically it is a git\-reset \-\-hard together with deletion of all untracked files that reside inside the working directory, including those in \.gitignore\.
|
||||
.
|
||||
.SH "EXAMPLES"
|
||||
Clears the repo\.
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
|
||||
<p> Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD. Basically it is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory.</p>
|
||||
deletion of all untracked files that reside inside the working directory, including those in .gitignore.</p>
|
||||
|
||||
<h2 id="EXAMPLES">EXAMPLES</h2>
|
||||
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
|
||||
<h2 id="AUTHOR">AUTHOR</h2>
|
||||
|
||||
<p>Written by Daniel 'grindhold' Brendle <<a href="mailto:grindhold@gmx.net" data-bare-link="true">grindhold@gmx.net</a>></p>
|
||||
<p>Written by Daniel 'grindhold' Brendle <<a href="mailto:grindhold@gmx.net" data-bare-link="true">grindhold@gmx.net</a>></p>
|
||||
|
||||
<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
|
||||
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
|
||||
<ol class='man-decor man-foot man foot'>
|
||||
<li class='tl'></li>
|
||||
<li class='tc'>December 2015</li>
|
||||
<li class='tc'>May 2016</li>
|
||||
<li class='tr'>git-clear(1)</li>
|
||||
</ol>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-clear(1) -- Rigorously clean up a repository
|
|||
|
||||
Clears the repository to a state that it looks as if it was freshly cloned
|
||||
with the current HEAD. Basically it is a git-reset --hard together with
|
||||
deletion of all untracked files that reside inside the working directory.
|
||||
deletion of all untracked files that reside inside the working directory, including those in .gitignore.
|
||||
|
||||
## EXAMPLES
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue