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

Side by Side Diff: docs/man1/git-freeze.1

Issue 200903002: Add documentation for git-map-branches, git-map, git-nav-downstream, (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@documentation
Patch Set: rebase Created 6 years, 8 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
« no previous file with comments | « docs/man1/depot_tools.1 ('k') | docs/man1/git-map.1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/13/2014 5 .\" Date: 03/14/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools f48b2c2 7 .\" Source: depot_tools a57ed8f
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-FREEZE" "1" "03/13/2014" "depot_tools f48b2c2" "Chromium depot_tools M anual" 10 .TH "GIT\-FREEZE" "1" "03/14/2014" "depot_tools a57ed8f" "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 .\" -----------------------------------------------------------------
21 .\" * set default formatting 21 .\" * set default formatting
22 .\" ----------------------------------------------------------------- 22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation 23 .\" disable hyphenation
24 .nh 24 .nh
25 .\" disable justification (adjust text to left margin only) 25 .\" disable justification (adjust text to left margin only)
26 .ad l 26 .ad l
27 .\" ----------------------------------------------------------------- 27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE * 28 .\" * MAIN CONTENT STARTS HERE *
29 .\" ----------------------------------------------------------------- 29 .\" -----------------------------------------------------------------
30 .SH "NAME" 30 .SH "NAME"
31 git-freeze \- Freeze all changes on a branch (indexed and unindexed) 31 git-freeze \- Freeze all changes on a branch (indexed and unindexed)\&.
32 .SH "SYNOPSIS" 32 .SH "SYNOPSIS"
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 .SH "EXAMPLE"
44 .sp
45 .if n \{\
46 .RS 4
47 .\}
48 .nf
49 \fB$ git status \-\-short\fR
50 A added_file
51 A\:M added_file_with_unstaged_changes
52 D deleted_file
53 M modified_file
54 D unstaged_deleted_file
55 ?? unadded_file
56 \fB$ git freeze\fR
57 \fB$ git status \-\-short\fR
58 \fB$ git log \-n 2 \-\-stat\fR
59 commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd
60 Author: Robert Iannucci <iannucci@chromium\&.org>
61 Date: Thu Mar 13 17:42:37 2014 \-0700
62
63 FREEZE\&.unindexed
64
65 added_file_with_unstaged_changes | 3 ++\:\-
66 modified_file | 4 +++\:\-
67 unadded_file | 3 +++
68 unstaged_deleted_file | 1 \-
69 4 files changed, 8 insertions(+), 3 deletions(\-)
70
71 commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4
72 Author: Robert Iannucci <iannucci@chromium\&.org>
73 Date: Thu Mar 13 17:42:37 2014 \-0700
74
75 FREEZE\&.indexed
76
77 added_file | 3 +++
78 added_file_with_unstaged_changes | 1 +
79 deleted_file | 1 \-
80 3 files changed, 4 insertions(+), 1 deletion(\-)
81 \fB$ git thaw\fR
82 \fB$ git status \-\-short\fR
83 A added_file
84 A\:M added_file_with_unstaged_changes
85 D deleted_file
86 M modified_file
87 D unstaged_deleted_file
88 ?? unadded_file
89 .fi
90 .if n \{\
91 .RE
92 .\}
93 .sp
43 .SH "SEE ALSO" 94 .SH "SEE ALSO"
44 .sp 95 .sp
45 \fBgit-thaw\fR(1) 96 \fBgit-thaw\fR(1)
46 .SH "CHROMIUM DEPOT_TOOLS" 97 .SH "CHROMIUM DEPOT_TOOLS"
47 .sp 98 .sp
48 Part of the chromium depot_tools suite\&. These tools are meant to assist with t he development of chromium and related projects\&. Download the tools from \m[bl ue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. 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\&.
49 .SH "NOTES" 100 .SH "NOTES"
50 .IP " 1." 4 101 .IP " 1." 4
51 here 102 here
52 .RS 4 103 .RS 4
53 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 104 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
54 .RE 105 .RE
OLDNEW
« no previous file with comments | « docs/man1/depot_tools.1 ('k') | docs/man1/git-map.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698