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

Side by Side Diff: docs/src/git-freeze.txt

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, 9 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/src/depot_tools.txt ('k') | docs/src/git-map.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 git-freeze(1)
2 =============
3
4 NAME
5 ----
6 git-freeze -
7 include::_git-freeze_desc.helper.txt[]
8
9 SYNOPSIS
10 --------
11 [verse]
12 'git freeze'
13
14 DESCRIPTION
15 -----------
16
17 `git freeze` works a lot like `git stash`, in that it stores the current changes
18 in your working copy and index 'somewhere'. Unlike `git stash`, `git freeze`
19 stores those changes on your current branch. This effectively allows you to
20 'pause' development of a branch, work on something else, and then come back to
21 exactly the same working state later (by running `git thaw`).
22
23 `git freeze` will make up to 2 commits on your branch. A commit with the message
24 `FREEZE.indexed` will contain all changes which you’ve added to your index (like
25 with 'git add', 'git mv', 'git rm', etc.). A commit with the message
26 `FREEZE.unindexed` will contain all changes which were not in your index at the
27 time you ran git freeze (freshly modified files, new files, etc.).
28
29 EXAMPLE
30 -------
31
32 [subs="specialcharacters,quotes,attributes"]
33 ----
34 [white]**$ git status --short**
35 [green]##A## added_file
36 [green]##A##{zwsp}[red]##M## added_file_with_unstaged_changes
37 [green]##D## deleted_file
38 [red]##M## modified_file
39 [red]##D## unstaged_deleted_file
40 [red]##??## unadded_file
41 [white]**$ git freeze**
42 [white]**$ git status --short**
43 [white]**$ git log -n 2 --stat**
44 [yellow]##commit 182eccae8e385acba21c9ff2713e98ff4b7e17cd##
45 Author: Robert Iannucci <iannucci@chromium.org>
46 Date: Thu Mar 13 17:42:37 2014 -0700
47
48 FREEZE.unindexed
49
50 added_file_with_unstaged_changes | 3 [green]##\+\+##{zwsp}[red]##-##
51 modified_file | 4 [green]##\+\+\+##{zwsp}[red]##-##
52 unadded_file | 3 [green]##\+\+\+##
53 unstaged_deleted_file | 1 [red]##-##
54 4 files changed, 8 insertions(\+), 3 deletions(-)
55
56 [yellow]##commit ce07bdc49a61f54e6142b4bba5cc517cf6802bd4##
57 Author: Robert Iannucci <iannucci@chromium.org>
58 Date: Thu Mar 13 17:42:37 2014 -0700
59
60 FREEZE.indexed
61
62 added_file | 3 [green]##\+\+\+##
63 added_file_with_unstaged_changes | 1 [green]##\+##
64 deleted_file | 1 [red]##-##
65 3 files changed, 4 insertions(+), 1 deletion(-)
66 [white]**$ git thaw**
67 [white]**$ git status --short**
68 [green]##A## added_file
69 [green]##A##{zwsp}[red]##M## added_file_with_unstaged_changes
70 [green]##D## deleted_file
71 [red]##M## modified_file
72 [red]##D## unstaged_deleted_file
73 [red]##??## unadded_file
74 ----
75
76 SEE ALSO
77 --------
78 linkgit:git-thaw[1]
79
80 include::_footer.txt[]
81
82 // vim: ft=asciidoc noexpandtab:
OLDNEW
« no previous file with comments | « docs/src/depot_tools.txt ('k') | docs/src/git-map.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698