OLD | NEW |
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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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> | 776 </div> |
777 </div> | 777 </div> |
778 <div class="sect1"> | 778 <div class="sect1"> |
779 <h2 id="_example">EXAMPLE</h2> | 779 <h2 id="_example">EXAMPLE</h2> |
780 <div class="sectionbody"> | 780 <div class="sectionbody"> |
781 <div class="listingblock"> | 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> |
782 <div class="content"> | 782 <span style="color: #19c518">A</span> added_file |
783 <pre><code><strong><span class="white">$ git status --short</span></strong> | 783 <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added
_file_with_unstaged_changes |
784 <span class="green">A</span> added_file | 784 <span style="color: #19c518">D</span> deleted_file |
785 <span class="green">A</span>​<span class="red">M</span> added_file_with_un
staged_changes | 785 <span style="color: #e42e16">M</span> modified_file |
786 <span class="green">D</span> deleted_file | 786 <span style="color: #e42e16">D</span> unstaged_deleted_file |
787 <span class="red">M</span> modified_file | 787 <span style="color: #e42e16">??</span> unadded_file |
788 <span class="red">D</span> unstaged_deleted_file | 788 <span style="font-weight: bold; color: #ffffff">$ git freeze</span> |
789 <span class="red">??</span> unadded_file | 789 <span style="font-weight: bold; color: #ffffff">$ git status --short</span> |
790 <strong><span class="white">$ git freeze</span></strong> | 790 <span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span> |
791 <strong><span class="white">$ git status --short</span></strong> | 791 <span style="color: #e7e71c">commit 2903a59a5323dd12438a9b3912a878a546b5d68a</sp
an> |
792 <strong><span class="white">$ git log -n 2 --stat</span></strong> | 792 Author: local <local@chromium.org> |
793 <span class="yellow">commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd</span> | 793 Date: Thu Apr 10 08:54:56 2014 +0000 |
794 Author: Robert Iannucci <iannucci@chromium.org> | |
795 Date: Thu Mar 13 17:42:37 2014 -0700 | |
796 | 794 |
797 FREEZE.unindexed | 795 FREEZE.unindexed |
798 | 796 |
799 added_file_with_unstaged_changes | 3 <span class="green">++</span>​<span
class="red">-</span> | 797 added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span> |
800 modified_file | 4 <span class="green">+++</span>​<span
class="red">-</span> | 798 modified_file | 1 <span style="color: #19c518">+</span> |
801 unadded_file | 3 <span class="green">+++</span> | 799 unadded_file | 0 |
802 unstaged_deleted_file | 1 <span class="red">-</span> | 800 unstaged_deleted_file | 1 <span style="color: #e42e16">-</span> |
803 4 files changed, 8 insertions(+), 3 deletions(-) | 801 4 files changed, 2 insertions(+), 1 deletion(-) |
804 | 802 |
805 <span class="yellow">commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4</span> | 803 <span style="color: #e7e71c">commit 19e09ed3f4a23417cf46ce0961fc7434132d0295</sp
an> |
806 Author: Robert Iannucci <iannucci@chromium.org> | 804 Author: local <local@chromium.org> |
807 Date: Thu Mar 13 17:42:37 2014 -0700 | 805 Date: Thu Apr 10 08:54:56 2014 +0000 |
808 | 806 |
809 FREEZE.indexed | 807 FREEZE.indexed |
810 | 808 |
811 added_file | 3 <span class="green">+++</span> | 809 added_file | 1 <span style="color: #19c518">+</span> |
812 added_file_with_unstaged_changes | 1 <span class="green">+</span> | 810 added_file_with_unstaged_changes | 1 <span style="color: #19c518">+</span> |
813 deleted_file | 1 <span class="red">-</span> | 811 deleted_file | 1 <span style="color: #e42e16">-</span> |
814 3 files changed, 4 insertions(+), 1 deletion(-) | 812 3 files changed, 2 insertions(+), 1 deletion(-) |
815 <strong><span class="white">$ git thaw</span></strong> | 813 <span style="font-weight: bold; color: #ffffff">$ git thaw</span> |
816 <strong><span class="white">$ git status --short</span></strong> | 814 <span style="font-weight: bold; color: #ffffff">$ git status --short</span> |
817 <span class="green">A</span> added_file | 815 <span style="color: #19c518">A</span> added_file |
818 <span class="green">A</span>​<span class="red">M</span> added_file_with_un
staged_changes | 816 <span style="color: #19c518">A</span><span style="color: #e42e16">M</span> added
_file_with_unstaged_changes |
819 <span class="green">D</span> deleted_file | 817 <span style="color: #19c518">D</span> deleted_file |
820 <span class="red">M</span> modified_file | 818 <span style="color: #e42e16">M</span> modified_file |
821 <span class="red">D</span> unstaged_deleted_file | 819 <span style="color: #e42e16">D</span> unstaged_deleted_file |
822 <span class="red">??</span> unadded_file</code></pre> | 820 <span style="color: #e42e16">??</span> unadded_file |
823 </div></div> | 821 </code></pre></div></div><p><div class="paragraph"></p></div> |
824 </div> | 822 </div> |
825 </div> | 823 </div> |
826 <div class="sect1"> | 824 <div class="sect1"> |
827 <h2 id="_see_also">SEE ALSO</h2> | 825 <h2 id="_see_also">SEE ALSO</h2> |
828 <div class="sectionbody"> | 826 <div class="sectionbody"> |
829 <div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div> | 827 <div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div> |
830 </div> | 828 </div> |
831 </div> | 829 </div> |
832 <div class="sect1"> | 830 <div class="sect1"> |
833 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> | 831 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> |
834 <div class="sectionbody"> | 832 <div class="sectionbody"> |
835 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(1)</a> suite. These tools are meant to | 833 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(7)</a> suite. These tools are meant to |
836 assist with the development of chromium and related projects. Download the tools | 834 assist with the development of chromium and related projects. Download the tools |
837 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> | 835 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> |
838 </div> | 836 </div> |
839 </div> | 837 </div> |
840 </div> | 838 </div> |
841 <div id="footnotes"><hr /></div> | 839 <div id="footnotes"><hr /></div> |
842 <div id="footer"> | 840 <div id="footer"> |
843 <div id="footer-text"> | 841 <div id="footer-text"> |
844 Last updated 2014-03-25 15:09:11 PDT | 842 Last updated 2014-04-10 14:23:11 PDT |
845 </div> | 843 </div> |
846 </div> | 844 </div> |
847 </body> | 845 </body> |
848 </html> | 846 </html> |
OLD | NEW |