OLD | NEW |
1 '\" t | 1 '\" t |
2 .\" Title: git-freeze | 2 .\" Title: git-freeze |
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] | 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> | 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
5 .\" Date: 04/10/2014 | 5 .\" Date: 06/04/2014 |
6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
7 .\" Source: depot_tools 68b1017 | 7 .\" Source: depot_tools d39bbb5 |
8 .\" Language: English | 8 .\" Language: English |
9 .\" | 9 .\" |
10 .TH "GIT\-FREEZE" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools M
anual" | 10 .TH "GIT\-FREEZE" "1" "06/04/2014" "depot_tools d39bbb5" "Chromium depot_tools M
anual" |
11 .\" ----------------------------------------------------------------- | 11 .\" ----------------------------------------------------------------- |
12 .\" * Define some portability stuff | 12 .\" * Define some portability stuff |
13 .\" ----------------------------------------------------------------- | 13 .\" ----------------------------------------------------------------- |
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
15 .\" http://bugs.debian.org/507673 | 15 .\" http://bugs.debian.org/507673 |
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html | 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html |
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
18 .ie \n(.g .ds Aq \(aq | 18 .ie \n(.g .ds Aq \(aq |
19 .el .ds Aq ' | 19 .el .ds Aq ' |
20 .\" ----------------------------------------------------------------- | 20 .\" ----------------------------------------------------------------- |
(...skipping 12 matching lines...) Expand all Loading... |
33 .sp | 33 .sp |
34 .nf | 34 .nf |
35 \fIgit freeze\fR | 35 \fIgit freeze\fR |
36 .fi | 36 .fi |
37 .sp | 37 .sp |
38 .SH "DESCRIPTION" | 38 .SH "DESCRIPTION" |
39 .sp | 39 .sp |
40 git freeze works a lot like git stash, in that it stores the current changes in
your working copy and index \fIsomewhere\fR\&. Unlike git stash, git freeze stor
es those changes on your current branch\&. This effectively allows you to \fIpau
se\fR development of a branch, work on something else, and then come back to exa
ctly the same working state later (by running git thaw)\&. | 40 git freeze works a lot like git stash, in that it stores the current changes in
your working copy and index \fIsomewhere\fR\&. Unlike git stash, git freeze stor
es those changes on your current branch\&. This effectively allows you to \fIpau
se\fR development of a branch, work on something else, and then come back to exa
ctly the same working state later (by running git thaw)\&. |
41 .sp | 41 .sp |
42 git freeze will make up to 2 commits on your branch\&. A commit with the message
FREEZE\&.indexed will contain all changes which you\(cqve added to your index (
like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with th
e message FREEZE\&.unindexed will contain all changes which were not in your ind
ex at the time you ran git freeze (freshly modified files, new files, etc\&.)\&. | 42 git freeze will make up to 2 commits on your branch\&. A commit with the message
FREEZE\&.indexed will contain all changes which you\(cqve added to your index (
like with \fIgit add\fR, \fIgit mv\fR, \fIgit rm\fR, etc\&.)\&. A commit with th
e message FREEZE\&.unindexed will contain all changes which were not in your ind
ex at the time you ran git freeze (freshly modified files, new files, etc\&.)\&. |
| 43 .sp |
| 44 By default git freeze will only freeze up to 100MB of untracked files\&. See \fI
CONFIGURATION VARIABLES\fR for more details\&. |
43 .SH "EXAMPLE" | 45 .SH "EXAMPLE" |
44 .sp | 46 .sp |
45 | 47 |
46 .sp | 48 .sp |
47 .if n \{\ | 49 .if n \{\ |
48 .RS 4 | 50 .RS 4 |
49 .\} | 51 .\} |
50 .nf | 52 .nf |
51 \fB$ git status \-\-short\fR | 53 \fB$ git status \-\-short\fR |
52 A added_file | 54 A added_file |
53 AM added_file_with_unstaged_changes | 55 AM added_file_with_unstaged_changes |
54 D deleted_file | 56 D deleted_file |
55 M modified_file | 57 M modified_file |
56 D unstaged_deleted_file | 58 D unstaged_deleted_file |
57 ?? unadded_file | 59 ?? unadded_file |
58 \fB$ git freeze\fR | 60 \fB$ git freeze\fR |
59 \fB$ git status \-\-short\fR | 61 \fB$ git status \-\-short\fR |
60 \fB$ git log \-n 2 \-\-stat\fR | 62 \fB$ git log \-n 2 \-\-stat\fR |
61 commit 85b90eda860a6f62d95efdb29a09ebe2bace018d | 63 commit 13e157e1f666206fca297c48bec82f3f16ae3c2f |
62 Author: local <local@chromium\&.org> | 64 Author: local <local@chromium\&.org> |
63 Date: Thu Apr 10 08:54:56 2014 +0000 | 65 Date: Thu Apr 10 08:54:56 2014 +0000 |
64 | 66 |
65 FREEZE\&.unindexed | 67 FREEZE\&.unindexed |
66 | 68 |
67 added_file_with_unstaged_changes | 1 + | 69 added_file_with_unstaged_changes | 1 + |
68 modified_file | 1 + | 70 modified_file | 1 + |
69 unadded_file | 0 | 71 unadded_file | 0 |
70 unstaged_deleted_file | 1 \- | 72 unstaged_deleted_file | 1 \- |
71 4 files changed, 2 insertions(+), 1 deletion(\-) | 73 4 files changed, 2 insertions(+), 1 deletion(\-) |
72 | 74 |
73 commit 4d4db1b3bfbb42b0c9c87326bd522cc9d6946911 | 75 commit 30791edff23b9a8fecc5f863da134e820a4c9f1a |
74 Author: local <local@chromium\&.org> | 76 Author: local <local@chromium\&.org> |
75 Date: Thu Apr 10 08:54:56 2014 +0000 | 77 Date: Thu Apr 10 08:54:56 2014 +0000 |
76 | 78 |
77 FREEZE\&.indexed | 79 FREEZE\&.indexed |
78 | 80 |
79 added_file | 1 + | 81 added_file | 1 + |
80 added_file_with_unstaged_changes | 1 + | 82 added_file_with_unstaged_changes | 1 + |
81 deleted_file | 1 \- | 83 deleted_file | 1 \- |
82 3 files changed, 2 insertions(+), 1 deletion(\-) | 84 3 files changed, 2 insertions(+), 1 deletion(\-) |
83 \fB$ git thaw\fR | 85 \fB$ git thaw\fR |
84 \fB$ git status \-\-short\fR | 86 \fB$ git status \-\-short\fR |
85 A added_file | 87 A added_file |
86 AM added_file_with_unstaged_changes | 88 AM added_file_with_unstaged_changes |
87 D deleted_file | 89 D deleted_file |
88 M modified_file | 90 M modified_file |
89 D unstaged_deleted_file | 91 D unstaged_deleted_file |
90 ?? unadded_file | 92 ?? unadded_file |
91 .fi | 93 .fi |
92 .if n \{\ | 94 .if n \{\ |
93 .RE | 95 .RE |
94 .\} | 96 .\} |
95 .sp | 97 .sp |
| 98 .SH "CONFIGURATION VARIABLES" |
| 99 .SS "depot\-tools\&.freeze\-size\-limit" |
| 100 .sp |
| 101 This sets the size limit as an integer number of megabytes of untracked files th
at git\-freeze will be willing to put in suspended animation\&. A 0 or negative
limit disables the size\-limit check entirely\&. \fB100\fR by default\&. |
96 .SH "SEE ALSO" | 102 .SH "SEE ALSO" |
97 .sp | 103 .sp |
98 \fBgit-thaw\fR(1) | 104 \fBgit-thaw\fR(1) |
99 .SH "CHROMIUM DEPOT_TOOLS" | 105 .SH "CHROMIUM DEPOT_TOOLS" |
100 .sp | 106 .sp |
101 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
st with the development of chromium and related projects\&. Download the tools f
rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. | 107 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
st with the development of chromium and related projects\&. Download the tools f
rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |
102 .SH "NOTES" | 108 .SH "NOTES" |
103 .IP " 1." 4 | 109 .IP " 1." 4 |
104 here | 110 here |
105 .RS 4 | 111 .RS 4 |
106 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 112 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
107 .RE | 113 .RE |
OLD | NEW |