OLD | NEW |
1 git-freeze(1) | 1 git-freeze(1) |
2 ============= | 2 ============= |
3 | 3 |
4 NAME | 4 NAME |
5 ---- | 5 ---- |
6 git-freeze - | 6 git-freeze - |
7 include::_git-freeze_desc.helper.txt[] | 7 include::_git-freeze_desc.helper.txt[] |
8 | 8 |
9 SYNOPSIS | 9 SYNOPSIS |
10 -------- | 10 -------- |
(...skipping 10 matching lines...) Expand all Loading... |
21 exactly the same working state later (by running `git thaw`). | 21 exactly the same working state later (by running `git thaw`). |
22 | 22 |
23 `git freeze` will make up to 2 commits on your branch. A commit with the message | 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 | 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 | 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 | 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.). | 27 time you ran git freeze (freshly modified files, new files, etc.). |
28 | 28 |
29 EXAMPLE | 29 EXAMPLE |
30 ------- | 30 ------- |
31 | 31 demo:1[] |
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 | 32 |
76 SEE ALSO | 33 SEE ALSO |
77 -------- | 34 -------- |
78 linkgit:git-thaw[1] | 35 linkgit:git-thaw[1] |
79 | 36 |
80 include::_footer.txt[] | 37 include::_footer.txt[] |
81 | 38 |
82 // vim: ft=asciidoc: | 39 // vim: ft=asciidoc: |
OLD | NEW |