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

Unified Diff: docs/man1/git-freeze.1

Issue 225433003: Add a basic tutorial for the tools in depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@git_map
Patch Set: pylint 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « docs/html/git-upstream-diff.html ('k') | docs/man1/git-map.1 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/man1/git-freeze.1
diff --git a/docs/man1/git-freeze.1 b/docs/man1/git-freeze.1
index 8bdde06bb562373728ce4e9d7ed40a1882b56214..1d4a2a8298fc3224067b58bfab296f21b0e89379 100644
--- a/docs/man1/git-freeze.1
+++ b/docs/man1/git-freeze.1
@@ -2,12 +2,12 @@
.\" Title: git-freeze
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 03/25/2014
+.\" Date: 04/10/2014
.\" Manual: Chromium depot_tools Manual
-.\" Source: depot_tools 207bff1
+.\" Source: depot_tools 68b1017
.\" Language: English
.\"
-.TH "GIT\-FREEZE" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual"
+.TH "GIT\-FREEZE" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -42,13 +42,15 @@ git freeze works a lot like git stash, in that it stores the current changes in
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 the message FREEZE\&.unindexed will contain all changes which were not in your index at the time you ran git freeze (freshly modified files, new files, etc\&.)\&.
.SH "EXAMPLE"
.sp
+
+.sp
.if n \{\
.RS 4
.\}
.nf
\fB$ git status \-\-short\fR
A added_file
-A\:M added_file_with_unstaged_changes
+AM added_file_with_unstaged_changes
D deleted_file
M modified_file
D unstaged_deleted_file
@@ -56,32 +58,32 @@ D deleted_file
\fB$ git freeze\fR
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
-commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd
-Author: Robert Iannucci <iannucci@chromium\&.org>
-Date: Thu Mar 13 17:42:37 2014 \-0700
+commit bed4472f2ad34bebabd7cf79f3155ebc6d86707d
+Author: local <local@chromium\&.org>
+Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE\&.unindexed
- added_file_with_unstaged_changes | 3 ++\:\-
- modified_file | 4 +++\:\-
- unadded_file | 3 +++
+ added_file_with_unstaged_changes | 1 +
+ modified_file | 1 +
+ unadded_file | 0
unstaged_deleted_file | 1 \-
- 4 files changed, 8 insertions(+), 3 deletions(\-)
+ 4 files changed, 2 insertions(+), 1 deletion(\-)
-commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4
-Author: Robert Iannucci <iannucci@chromium\&.org>
-Date: Thu Mar 13 17:42:37 2014 \-0700
+commit cde1eb5500ede60053ae47b3fb1231e9e62be793
+Author: local <local@chromium\&.org>
+Date: Thu Apr 10 08:54:56 2014 +0000
FREEZE\&.indexed
- added_file | 3 +++
+ added_file | 1 +
added_file_with_unstaged_changes | 1 +
deleted_file | 1 \-
- 3 files changed, 4 insertions(+), 1 deletion(\-)
+ 3 files changed, 2 insertions(+), 1 deletion(\-)
\fB$ git thaw\fR
\fB$ git status \-\-short\fR
A added_file
-A\:M added_file_with_unstaged_changes
+AM added_file_with_unstaged_changes
D deleted_file
M modified_file
D unstaged_deleted_file
@@ -96,7 +98,7 @@ D deleted_file
\fBgit-thaw\fR(1)
.SH "CHROMIUM DEPOT_TOOLS"
.sp
-Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
+Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
.SH "NOTES"
.IP " 1." 4
here
« no previous file with comments | « docs/html/git-upstream-diff.html ('k') | docs/man1/git-map.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698