Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: man/html/git-freeze.html

Issue 2052113002: Make git-freeze bail out if the user has too much untracked data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Address comments Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« git_common.py ('K') | « git_common.py ('k') | man/man1/git-freeze.1 » ('j') | tests/git_common_test.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >
6 <meta name="generator" content="AsciiDoc 8.6.9" /> 6 <meta name="generator" content="AsciiDoc 8.6.9" />
7 <title>git-freeze(1)</title> 7 <title>git-freeze(1)</title>
8 <style type="text/css"> 8 <style type="text/css">
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10 10
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 <div class="paragraph"><p><code>git freeze</code> works a lot like <code>git sta sh</code>, in that it stores the current changes 766 <div class="paragraph"><p><code>git freeze</code> works a lot like <code>git sta sh</code>, in that it stores the current changes
767 in your working copy and index <em>somewhere</em>. Unlike <code>git stash</code> , <code>git freeze</code> 767 in your working copy and index <em>somewhere</em>. Unlike <code>git stash</code> , <code>git freeze</code>
768 stores those changes on your current branch. This effectively allows you to 768 stores those changes on your current branch. This effectively allows you to
769 <em>pause</em> development of a branch, work on something else, and then come ba ck to 769 <em>pause</em> development of a branch, work on something else, and then come ba ck to
770 exactly the same working state later (by running <code>git thaw</code>).</p></di v> 770 exactly the same working state later (by running <code>git thaw</code>).</p></di v>
771 <div class="paragraph"><p><code>git freeze</code> will make up to 2 commits on y our branch. A commit with the message 771 <div class="paragraph"><p><code>git freeze</code> will make up to 2 commits on y our branch. A commit with the message
772 <code>FREEZE.indexed</code> will contain all changes which you’ve added to your index (like 772 <code>FREEZE.indexed</code> will contain all changes which you’ve added to your index (like
773 with <em>git add</em>, <em>git mv</em>, <em>git rm</em>, etc.). A commit with th e message 773 with <em>git add</em>, <em>git mv</em>, <em>git rm</em>, etc.). A commit with th e message
774 <code>FREEZE.unindexed</code> will contain all changes which were not in your in dex at the 774 <code>FREEZE.unindexed</code> will contain all changes which were not in your in dex at the
775 time you ran git freeze (freshly modified files, new files, etc.).</p></div> 775 time you ran git freeze (freshly modified files, new files, etc.).</p></div>
776 <div class="paragraph"><p>By default <code>git freeze</code> will only freeze up to 100MB of untracked files. See
777 <em>CONFIGURATION VARIABLES</em> for more details.</p></div>
776 </div> 778 </div>
777 </div> 779 </div>
778 <div class="sect1"> 780 <div class="sect1">
779 <h2 id="_example">EXAMPLE</h2> 781 <h2 id="_example">EXAMPLE</h2>
780 <div class="sectionbody"> 782 <div class="sectionbody">
781 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git status --sho rt</span> 783 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git status --sho rt</span>
782 <span style="color: #19c518">A</span> added_file 784 <span style="color: #19c518">A</span> added_file
783 <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added _file_with_unstaged_changes 785 <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added _file_with_unstaged_changes
784 <span style="color: #19c518">D</span> deleted_file 786 <span style="color: #19c518">D</span> deleted_file
785 <span style="color: #e42e16">M</span> modified_file 787 <span style="color: #e42e16">M</span> modified_file
786 <span style="color: #e42e16">D</span> unstaged_deleted_file 788 <span style="color: #e42e16">D</span> unstaged_deleted_file
787 <span style="color: #e42e16">??</span> unadded_file 789 <span style="color: #e42e16">??</span> unadded_file
788 <span style="font-weight: bold; color: #ffffff">$ git freeze</span> 790 <span style="font-weight: bold; color: #ffffff">$ git freeze</span>
789 <span style="font-weight: bold; color: #ffffff">$ git status --short</span> 791 <span style="font-weight: bold; color: #ffffff">$ git status --short</span>
790 <span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span> 792 <span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
791 <span style="color: #e7e71c">commit 648c29b68da0142bcad41872339f9732c6ec4470</sp an> 793 <span style="color: #e7e71c">commit 07f208f5916bd8ee3affbf8d182c918a8dc1a699</sp an>
792 Author: local &lt;local@chromium.org&gt; 794 Author: local &lt;local@chromium.org&gt;
793 Date: Thu Apr 10 08:54:56 2014 +0000 795 Date: Thu Apr 10 08:54:56 2014 +0000
794 796
795 FREEZE.unindexed 797 FREEZE.unindexed
796 798
797 added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span> 799 added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
798 modified_file | 1 <span style="color: #19c518">+</span> 800 modified_file | 1 <span style="color: #19c518">+</span>
799 unadded_file | 0 801 unadded_file | 0
800 unstaged_deleted_file | 1 <span style="color: #e42e16">-</span> 802 unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
801 4 files changed, 2 insertions(+), 1 deletion(-) 803 4 files changed, 2 insertions(+), 1 deletion(-)
802 804
803 <span style="color: #e7e71c">commit a4e49c2896814f52feec3fc06ef0454962ee6b8c</sp an> 805 <span style="color: #e7e71c">commit 9f803ff1f05dd0c77d31b8958992520e37ed6278</sp an>
804 Author: local &lt;local@chromium.org&gt; 806 Author: local &lt;local@chromium.org&gt;
805 Date: Thu Apr 10 08:54:56 2014 +0000 807 Date: Thu Apr 10 08:54:56 2014 +0000
806 808
807 FREEZE.indexed 809 FREEZE.indexed
808 810
809 added_file | 1 <span style="color: #19c518">+</span> 811 added_file | 1 <span style="color: #19c518">+</span>
810 added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span> 812 added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span>
811 deleted_file | 1 <span style="color: #e42e16">-</span> 813 deleted_file | 1 <span style="color: #e42e16">-</span>
812 3 files changed, 2 insertions(+), 1 deletion(-) 814 3 files changed, 2 insertions(+), 1 deletion(-)
813 <span style="font-weight: bold; color: #ffffff">$ git thaw</span> 815 <span style="font-weight: bold; color: #ffffff">$ git thaw</span>
814 <span style="font-weight: bold; color: #ffffff">$ git status --short</span> 816 <span style="font-weight: bold; color: #ffffff">$ git status --short</span>
815 <span style="color: #19c518">A</span> added_file 817 <span style="color: #19c518">A</span> added_file
816 <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added _file_with_unstaged_changes 818 <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added _file_with_unstaged_changes
817 <span style="color: #19c518">D</span> deleted_file 819 <span style="color: #19c518">D</span> deleted_file
818 <span style="color: #e42e16">M</span> modified_file 820 <span style="color: #e42e16">M</span> modified_file
819 <span style="color: #e42e16">D</span> unstaged_deleted_file 821 <span style="color: #e42e16">D</span> unstaged_deleted_file
820 <span style="color: #e42e16">??</span> unadded_file 822 <span style="color: #e42e16">??</span> unadded_file
821 </code></pre></div></div><p><div class="paragraph"></p></div> 823 </code></pre></div></div><p><div class="paragraph"></p></div>
822 </div> 824 </div>
823 </div> 825 </div>
824 <div class="sect1"> 826 <div class="sect1">
827 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
828 <div class="sectionbody">
829 <div class="sect2">
830 <h3 id="_depot_tools_freeze_size_limit">depot-tools.freeze-size-limit</h3>
831 <div class="paragraph"><p>This sets the size limit as an integer number of megab ytes of untracked files
832 that git-freeze will be willing to put in suspended animation. A 0 or negative
833 limit disables the size-limit check entirely. <strong>100</strong> by default.</ p></div>
834 </div>
835 </div>
836 </div>
837 <div class="sect1">
825 <h2 id="_see_also">SEE ALSO</h2> 838 <h2 id="_see_also">SEE ALSO</h2>
826 <div class="sectionbody"> 839 <div class="sectionbody">
827 <div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div> 840 <div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div>
828 </div> 841 </div>
829 </div> 842 </div>
830 <div class="sect1"> 843 <div class="sect1">
831 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 844 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
832 <div class="sectionbody"> 845 <div class="sectionbody">
833 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 846 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
834 assist with the development of chromium and related projects. Download the tools 847 assist with the development of chromium and related projects. Download the tools
835 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 848 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
836 </div> 849 </div>
837 </div> 850 </div>
838 </div> 851 </div>
839 <div id="footnotes"><hr /></div> 852 <div id="footnotes"><hr /></div>
840 <div id="footer"> 853 <div id="footer">
841 <div id="footer-text"> 854 <div id="footer-text">
842 Last updated 2014-04-10 14:23:11 PDT 855 Last updated 2014-06-04 16:12:59 PDT
843 </div> 856 </div>
844 </div> 857 </div>
845 </body> 858 </body>
846 </html> 859 </html>
OLDNEW
« git_common.py ('K') | « git_common.py ('k') | man/man1/git-freeze.1 » ('j') | tests/git_common_test.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698