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: 03/25/2014 | 5 .\" Date: 04/10/2014 |
6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
7 .\" Source: depot_tools 207bff1 | 7 .\" Source: depot_tools 68b1017 |
8 .\" Language: English | 8 .\" Language: English |
9 .\" | 9 .\" |
10 .TH "GIT\-FREEZE" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools M
anual" | 10 .TH "GIT\-FREEZE" "1" "04/10/2014" "depot_tools 68b1017" "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 14 matching lines...) Expand all Loading... |
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 .SH "EXAMPLE" | 43 .SH "EXAMPLE" |
44 .sp | 44 .sp |
| 45 |
| 46 .sp |
45 .if n \{\ | 47 .if n \{\ |
46 .RS 4 | 48 .RS 4 |
47 .\} | 49 .\} |
48 .nf | 50 .nf |
49 \fB$ git status \-\-short\fR | 51 \fB$ git status \-\-short\fR |
50 A added_file | 52 A added_file |
51 A\:M added_file_with_unstaged_changes | 53 AM added_file_with_unstaged_changes |
52 D deleted_file | 54 D deleted_file |
53 M modified_file | 55 M modified_file |
54 D unstaged_deleted_file | 56 D unstaged_deleted_file |
55 ?? unadded_file | 57 ?? unadded_file |
56 \fB$ git freeze\fR | 58 \fB$ git freeze\fR |
57 \fB$ git status \-\-short\fR | 59 \fB$ git status \-\-short\fR |
58 \fB$ git log \-n 2 \-\-stat\fR | 60 \fB$ git log \-n 2 \-\-stat\fR |
59 commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd | 61 commit bed4472f2ad34bebabd7cf79f3155ebc6d86707d |
60 Author: Robert Iannucci <iannucci@chromium\&.org> | 62 Author: local <local@chromium\&.org> |
61 Date: Thu Mar 13 17:42:37 2014 \-0700 | 63 Date: Thu Apr 10 08:54:56 2014 +0000 |
62 | 64 |
63 FREEZE\&.unindexed | 65 FREEZE\&.unindexed |
64 | 66 |
65 added_file_with_unstaged_changes | 3 ++\:\- | 67 added_file_with_unstaged_changes | 1 + |
66 modified_file | 4 +++\:\- | 68 modified_file | 1 + |
67 unadded_file | 3 +++ | 69 unadded_file | 0 |
68 unstaged_deleted_file | 1 \- | 70 unstaged_deleted_file | 1 \- |
69 4 files changed, 8 insertions(+), 3 deletions(\-) | 71 4 files changed, 2 insertions(+), 1 deletion(\-) |
70 | 72 |
71 commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4 | 73 commit cde1eb5500ede60053ae47b3fb1231e9e62be793 |
72 Author: Robert Iannucci <iannucci@chromium\&.org> | 74 Author: local <local@chromium\&.org> |
73 Date: Thu Mar 13 17:42:37 2014 \-0700 | 75 Date: Thu Apr 10 08:54:56 2014 +0000 |
74 | 76 |
75 FREEZE\&.indexed | 77 FREEZE\&.indexed |
76 | 78 |
77 added_file | 3 +++ | 79 added_file | 1 + |
78 added_file_with_unstaged_changes | 1 + | 80 added_file_with_unstaged_changes | 1 + |
79 deleted_file | 1 \- | 81 deleted_file | 1 \- |
80 3 files changed, 4 insertions(+), 1 deletion(\-) | 82 3 files changed, 2 insertions(+), 1 deletion(\-) |
81 \fB$ git thaw\fR | 83 \fB$ git thaw\fR |
82 \fB$ git status \-\-short\fR | 84 \fB$ git status \-\-short\fR |
83 A added_file | 85 A added_file |
84 A\:M added_file_with_unstaged_changes | 86 AM added_file_with_unstaged_changes |
85 D deleted_file | 87 D deleted_file |
86 M modified_file | 88 M modified_file |
87 D unstaged_deleted_file | 89 D unstaged_deleted_file |
88 ?? unadded_file | 90 ?? unadded_file |
89 .fi | 91 .fi |
90 .if n \{\ | 92 .if n \{\ |
91 .RE | 93 .RE |
92 .\} | 94 .\} |
93 .sp | 95 .sp |
94 .SH "SEE ALSO" | 96 .SH "SEE ALSO" |
95 .sp | 97 .sp |
96 \fBgit-thaw\fR(1) | 98 \fBgit-thaw\fR(1) |
97 .SH "CHROMIUM DEPOT_TOOLS" | 99 .SH "CHROMIUM DEPOT_TOOLS" |
98 .sp | 100 .sp |
99 Part of the chromium \fBdepot_tools\fR(1) 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\&. | 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\&. |
100 .SH "NOTES" | 102 .SH "NOTES" |
101 .IP " 1." 4 | 103 .IP " 1." 4 |
102 here | 104 here |
103 .RS 4 | 105 .RS 4 |
104 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 106 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
105 .RE | 107 .RE |
OLD | NEW |