-
Notifications
You must be signed in to change notification settings - Fork 0
/
git.mm
267 lines (266 loc) · 36.3 KB
/
git.mm
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
<map version="freeplane 1.3.0">
<!--To view this file, download free mind mapping software Freeplane from http://freeplane.sourceforge.net -->
<node TEXT="+ git +" ID="ID_1723255651" CREATED="1283093380553" MODIFIED="1444657367466" BACKGROUND_COLOR="#cccccc">
<font NAME="Monospaced" SIZE="24"/>
<hook NAME="AutomaticEdgeColor" COUNTER="7"/>
<hook NAME="MapStyle" background="#f0f2f0">
<properties show_icon_for_attributes="true" show_note_icons="true"/>
<map_styles>
<stylenode LOCALIZED_TEXT="styles.root_node">
<stylenode LOCALIZED_TEXT="styles.predefined" POSITION="right">
<stylenode LOCALIZED_TEXT="default" MAX_WIDTH="600" COLOR="#000099" STYLE="fork">
<font NAME="Verdana" SIZE="13" BOLD="false" ITALIC="false"/>
<edge STYLE="bezier" WIDTH="2"/>
</stylenode>
<stylenode LOCALIZED_TEXT="defaultstyle.details" COLOR="#000001" BACKGROUND_COLOR="#ffeb89" STYLE="bubble" FORMAT="STANDARD_FORMAT" MIN_WIDTH="1">
<font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
</stylenode>
<stylenode LOCALIZED_TEXT="defaultstyle.note" COLOR="#000000" BACKGROUND_COLOR="#f7f7f7" STYLE="bubble" FORMAT="NO_FORMAT" MAX_WIDTH="2000">
<font NAME="Monospaced" SIZE="12" BOLD="false"/>
</stylenode>
<stylenode LOCALIZED_TEXT="defaultstyle.floating">
<edge STYLE="hide_edge"/>
<cloud COLOR="#f0f0f0" SHAPE="ROUND_RECT"/>
<font SIZE="12"/>
</stylenode>
</stylenode>
<stylenode LOCALIZED_TEXT="styles.user-defined" POSITION="right">
<stylenode LOCALIZED_TEXT="styles.topic" COLOR="#18898b" STYLE="fork">
<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
</stylenode>
<stylenode LOCALIZED_TEXT="styles.subtopic" COLOR="#cc3300" STYLE="fork">
<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
</stylenode>
<stylenode LOCALIZED_TEXT="styles.subsubtopic" COLOR="#669900">
<font NAME="Liberation Sans" SIZE="10" BOLD="true"/>
</stylenode>
<stylenode LOCALIZED_TEXT="styles.important" COLOR="#ff0000">
<icon BUILTIN="yes"/>
<font NAME="Ubuntu" SIZE="14"/>
<cloud COLOR="#ffffff" SHAPE="ARC"/>
</stylenode>
<stylenode TEXT="Перечисление" COLOR="#000001" BACKGROUND_COLOR="#ffeeaa" STYLE="bubble" FORMAT="STANDARD_FORMAT" MIN_WIDTH="1">
<font NAME="SansSerif" SIZE="12" BOLD="false" ITALIC="false"/>
<edge STYLE="horizontal"/>
</stylenode>
<stylenode TEXT="списокБезРамки" COLOR="#000000" BACKGROUND_COLOR="#e8e8e8" STYLE="bubble">
<font NAME="Verdana" SIZE="12" BOLD="false"/>
<edge STYLE="horizontal"/>
</stylenode>
</stylenode>
<stylenode LOCALIZED_TEXT="styles.AutomaticLayout" POSITION="right">
<stylenode LOCALIZED_TEXT="AutomaticLayout.level.root">
<font NAME="URW Gothic L" SIZE="18" BOLD="false"/>
</stylenode>
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,1">
<font SIZE="16"/>
</stylenode>
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,2" COLOR="#00b439">
<font SIZE="14"/>
</stylenode>
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,3" COLOR="#990000">
<font SIZE="12"/>
</stylenode>
<stylenode LOCALIZED_TEXT="AutomaticLayout.level,4" COLOR="#111111">
<font SIZE="10"/>
</stylenode>
</stylenode>
</stylenode>
</map_styles>
</hook>
<node TEXT="" LOCALIZED_STYLE_REF="AutomaticLayout.level.root" POSITION="right" ID="ID_1728607418" CREATED="1444655130144" MODIFIED="1444655296858">
<icon BUILTIN="help"/>
<edge COLOR="#ff0000"/>
<node TEXT="распределенная система управления версиями" STYLE_REF="Перечисление" ID="ID_1749579190" CREATED="1444655287832" MODIFIED="1460724730764"/>
<node TEXT="Линус Торвальдс и Джунио Хамано" STYLE_REF="Перечисление" ID="ID_1120129531" CREATED="1444656252597" MODIFIED="1460724730772"/>
<node TEXT="дата выпуска - 7 апреля 2005" STYLE_REF="Перечисление" ID="ID_1690473715" CREATED="1444655462874" MODIFIED="1460724730776"/>
<node TEXT="дико распростренена, используется практически во всех
открытых проектах" STYLE_REF="Перечисление" ID="ID_503096506" CREATED="1444656360913" MODIFIED="1460724730780"/>
</node>
<node TEXT="источники" POSITION="right" ID="ID_959922383" CREATED="1444656877124" MODIFIED="1444656909859">
<icon BUILTIN="internet"/>
<edge COLOR="#00ffff"/>
<node TEXT="википедия" STYLE_REF="списокБезРамки" ID="ID_268028583" CREATED="1444656915240" MODIFIED="1450099569579" LINK="https://ru.wikipedia.org/wiki/Git"/>
<node TEXT="git наглядная справка" STYLE_REF="списокБезРамки" ID="ID_103051799" CREATED="1450098474163" MODIFIED="1450099569577" LINK="https://marklodato.github.io/visual-git-guide/index-ru.html"/>
<node TEXT="linux Calculate" STYLE_REF="списокБезРамки" ID="ID_800540011" CREATED="1444657078788" MODIFIED="1450099569575" LINK="http://www.calculate-linux.ru/main/ru/git"/>
<node TEXT="хабра, про git на пальцах" STYLE_REF="списокБезРамки" ID="ID_1644300025" CREATED="1450098787050" MODIFIED="1450099569571" LINK="http://habrahabr.ru/post/68341/"/>
<node TEXT="хабра, основные команды" STYLE_REF="списокБезРамки" ID="ID_1911362737" CREATED="1450099516320" MODIFIED="1450109460405" LINK="http://habrahabr.ru/post/60347/">
<icon BUILTIN="bookmark"/>
</node>
</node>
<node TEXT="commands" POSITION="right" ID="ID_1078704554" CREATED="1444656577115" MODIFIED="1444657343903">
<edge COLOR="#ff00ff"/>
<node TEXT="add" STYLE_REF="списокБезРамки" ID="ID_1003453205" CREATED="1444659210250" MODIFIED="1445006114902">
<node TEXT="" ID="ID_1411328653" CREATED="1460722604568" MODIFIED="1460722610572">
<icon BUILTIN="help"/>
<node TEXT="индексация изменений" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1727924367" CREATED="1444659217677" MODIFIED="1450099813486"/>
<node TEXT="запись изменений из рабочей дириктории в "сцену"" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1225986633" CREATED="1460722567051" MODIFIED="1460722716630"/>
</node>
<node TEXT="" ID="ID_1349428614" CREATED="1450099887320" MODIFIED="1450099887320">
<node TEXT="" ID="ID_361225856" CREATED="1460722731445" MODIFIED="1460722731445">
<node TEXT="git add . индексирует все изменения в файле" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1599056725" CREATED="1450099890563" MODIFIED="1450099947268"/>
<node TEXT="$ touch new_file
$ git add ." LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_14277988" CREATED="1450099767454" MODIFIED="1450099810762"/>
</node>
<node TEXT="" ID="ID_629303978" CREATED="1460722725048" MODIFIED="1460722725048">
<node TEXT="git add namefile - индексация определенного файла" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1580074345" CREATED="1450099997808" MODIFIED="1450100054591"/>
<node TEXT="$ touch new_file_2
$ git add new_file_2" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_324002358" CREATED="1450100055752" MODIFIED="1450100065252"/>
</node>
</node>
</node>
<node TEXT="rm" STYLE_REF="списокБезРамки" ID="ID_1290011362" CREATED="1450105880230" MODIFIED="1450105886916">
<node TEXT="удаление файла из индакса и проекта" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1234038348" CREATED="1450105974857" MODIFIED="1450105994354"/>
<node TEXT="" ID="ID_593782747" CREATED="1450105995539" MODIFIED="1450106000768">
<icon BUILTIN="info"/>
<node TEXT="удаление определенного файла" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_411862664" CREATED="1450106039342" MODIFIED="1450106293962">
<node TEXT="$ touch file_for_rm
$ git add .
$ git commit
[master acec87c] renamed: new_file_2 -> file_for_rm
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename new_file_2 => file_for_rm (100%)
$ git rm file_for_rm
rm 'file_for_rm'
$ ls 
bash new_file" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_132220031" CREATED="1450106175239" MODIFIED="1450106243757"/>
</node>
<node TEXT="$ ls 
bash new_file new_file_2
$ git rm new_file_2
rm 'new_file_2'
$ ls
bash new_file" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_48450449" CREATED="1450106024445" MODIFIED="1450106028076"/>
</node>
</node>
<node TEXT="log" STYLE_REF="списокБезРамки" ID="ID_1636148983" CREATED="1444664189578" MODIFIED="1445006114910">
<node TEXT="" ID="ID_720723137" CREATED="1450108603155" MODIFIED="1450108603155">
<node TEXT="просмотр отдельных изменений" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_391061531" CREATED="1445006129955" MODIFIED="1450100171434"/>
<node TEXT="$ git log
commit 692c975664ee911aaa522dc33cc5f1544c4fcb30
Author: Artjom <[email protected]>
Date: Mon Dec 14 16:38:14 2015 +0300

 first commit" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_965299450" CREATED="1450100381296" MODIFIED="1450100384835"/>
</node>
<node TEXT="" ID="ID_641678608" CREATED="1450101277657" MODIFIED="1450101779235">
<icon BUILTIN="info"/>
<node TEXT="просмотр логов для одного файла" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_934186565" CREATED="1450101288943" MODIFIED="1450101307333">
<node TEXT="$ git log -- new_file_2
commit 7560ecab80e5fa096596da21a16f48771b7c067d
Author: Artjom <[email protected]>
Date: Mon Dec 14 16:52:00 2015 +0300

 delete file

commit 692c975664ee911aaa522dc33cc5f1544c4fcb30
Author: Artjom <[email protected]>
Date: Mon Dec 14 16:38:14 2015 +0300

 first commit" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1685152070" CREATED="1450101357363" MODIFIED="1450101361137"/>
</node>
<node TEXT="ключ -pretty" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1726808662" CREATED="1450108707766" MODIFIED="1450108728736">
<node TEXT="--pretty=oneline" STYLE_REF="списокБезРамки" ID="ID_54853009" CREATED="1450108761019" MODIFIED="1450108791562">
<node TEXT="$ git log --pretty=oneline
d36ea049eb6a2d14a3388fbb7f1468642c8e5ad9 Revert "Revert "added new_file_3""
7cfc6f4891e82bb6aee79911a771e0ee97adfac9 tag tadam!
ab167854547a6acf27cf0f97ec572ea81f1f996e Revert "added new_file_3"
aaeb3d62ba334e0be9e76b507b7499676db31701 added new_file_3
acec87c24ad413e8a74b270e41b3bf065d047a52 renamed: new_file_2 -> file_for_rm
692c975664ee911aaa522dc33cc5f1544c4fcb30 first commit" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1807756197" CREATED="1450108798637" MODIFIED="1450108840480"/>
</node>
<node TEXT="--pretty=short" STYLE_REF="списокБезРамки" ID="ID_998234283" CREATED="1450108793396" MODIFIED="1450108929739">
<node TEXT="$ git log --pretty=short
commit d36ea049eb6a2d14a3388fbb7f1468642c8e5ad9
Author: Artjom <[email protected]>

 Revert "Revert "added new_file_3""

commit 7cfc6f4891e82bb6aee79911a771e0ee97adfac9
Author: Artjom <[email protected]>

 tag tadam!

commit ab167854547a6acf27cf0f97ec572ea81f1f996e
Author: Artjom <[email protected]>

 Revert "added new_file_3"" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1278012426" CREATED="1450108890504" MODIFIED="1450108893993"/>
</node>
</node>
<node TEXT="просмотр подробной информации -p" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1971581221" CREATED="1450108464262" MODIFIED="1450108488807">
<node TEXT="$ git log -p
... 
commit d36ea049eb6a2d14a3388fbb7f1468642c8e5ad9
Author: Artjom <[email protected]>
Date: Mon Dec 14 18:49:40 2015 +0300

 Revert "Revert "added new_file_3""
 
 This reverts commit ab167854547a6acf27cf0f97ec572ea81f1f996e.

diff --git a/file_for_rm b/file_for_rm
deleted file mode 100644
index e69de29..0000000
diff --git a/new_file_4 b/new_file_4
new file mode 100644
index 0000000..e69de29
..." LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1934927587" CREATED="1450108490463" MODIFIED="1450108572178"/>
</node>
</node>
</node>
<node TEXT="revert" STYLE_REF="списокБезРамки" ID="ID_1045010497" CREATED="1450106800137" MODIFIED="1450106807621">
<node TEXT="отмена измений производимых отдельным комитом" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1543409150" CREATED="1450106811674" MODIFIED="1450106844509"/>
<node TEXT="" ID="ID_1682817383" CREATED="1450107180252" MODIFIED="1450107185886">
<icon BUILTIN="info"/>
<node TEXT="по кешу комита" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_459079172" CREATED="1450107189394" MODIFIED="1450107203032">
<node TEXT="$ git commit
[master aaeb3d6] added new_file_3
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename file_for_rm => new_file_4 (100%)
$ git revert aaeb3d6
[master ab16785] Revert "added new_file_3"
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename new_file_4 => file_for_rm (100%)" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_399281938" CREATED="1450107031573" MODIFIED="1450107064911"/>
</node>
<node TEXT="по тегу комита" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_167459708" CREATED="1450107204371" MODIFIED="1450107212940">
<node TEXT="$ cat > new_file
tadam!
$ git tag tadam
$ git add .
$ git commit
[master 7cfc6f4] tag tadam!
 1 file changed, 1 insertion(+)
$ git revert tadam
[master d36ea04] Revert "Revert "added new_file_3""
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename file_for_rm => new_file_4 (100%)" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_145825730" CREATED="1450108231794" MODIFIED="1450108276891"/>
</node>
</node>
</node>
<node TEXT="commit" STYLE_REF="списокБезРамки" ID="ID_132939908" CREATED="1444664194909" MODIFIED="1445006114912">
<node TEXT="отправка индексов в дерево" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_37708724" CREATED="1445006159396" MODIFIED="1450100265451"/>
<node TEXT="" ID="ID_644023433" CREATED="1450101175339" MODIFIED="1450101190149">
<icon BUILTIN="info"/>
<node TEXT="$ git commit -m 'first commit'
[master (root-commit) 692c975] first commit
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 new_file
 create mode 100644 new_file_2" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_263134426" CREATED="1450100304892" MODIFIED="1450100307667"/>
<node TEXT="commit filename - отправить индексы одного файла" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_488796730" CREATED="1450100948053" MODIFIED="1450101005510">
<node TEXT="$ git commit -m 'delete file' new_file_2
[master 7560eca] delete file
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 new_file_2" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_730737743" CREATED="1450101134970" MODIFIED="1450101138872"/>
</node>
<node TEXT="commit -a проиндексирует все файлы и отправит индексы на сервер
новые файлы индексироваться не будут, удаление будет учтено" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_750203619" CREATED="1450100804852" MODIFIED="1450100924419">
<node TEXT="$ git commit -a -m 'new_file'
[master 9460ba3] new_file
 1 file changed, 3 insertions(+)" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_400158525" CREATED="1450100862153" MODIFIED="1450100866281"/>
</node>
</node>
</node>
<node TEXT="checkout" STYLE_REF="списокБезРамки" ID="ID_532877470" CREATED="1444664212895" MODIFIED="1445006114919">
<node TEXT="выбор текущей ветки и извлечение файлов из коммитов" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1365039132" CREATED="1445006183554" MODIFIED="1450110603279"/>
<node TEXT="" ID="ID_1941195067" CREATED="1450110613117" MODIFIED="1450110623878">
<icon BUILTIN="info"/>
<node TEXT="создать новую и перейти" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_95960297" CREATED="1450110871663" MODIFIED="1450110879861">
<node TEXT="$ git checkout -b new_b
Switched to a new branch 'new_b'" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1360300852" CREATED="1450110902405" MODIFIED="1450111103005"/>
</node>
<node TEXT="перйти, все равно" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1022290637" CREATED="1450111252805" MODIFIED="1450111260385">
<node TEXT="git checkout -f some-branch" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_841903724" CREATED="1450111261532" MODIFIED="1450111287591"/>
</node>
<node TEXT="вернуть файл к оперделенному комиту" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1528293781" CREATED="1450112012684" MODIFIED="1450112038490">
<node TEXT="$ cat > new_file_6
now_new_string for commit
$ git commit -a
[master ad239f6] new string
 1 file changed, 1 insertion(+)
$ tail new_file_6 
now_new_string for commit
$ git checkout HEAD~1 new_file_6
$ tail new_file_6" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_45107774" CREATED="1450112040184" MODIFIED="1450112043332"/>
</node>
<node TEXT="вернуть файлы к прошлому состоянию" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_608822917" CREATED="1450111339777" MODIFIED="1450111371694">
<node TEXT="$ tail new_file_6
new_string
$ git checkout new_file_6
$ tail new_file_6" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_492086577" CREATED="1450111664955" MODIFIED="1450111668785"/>
</node>
<node TEXT="переключение между ветками" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_825903735" CREATED="1450110625503" MODIFIED="1450110641075">
<node TEXT="$ ls
bash new_file_4 new_file_5
$ git checkout master
Switched to branch 'master'
$ ls
bash new_file_4" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_348481323" CREATED="1450111206482" MODIFIED="1450111209940"/>
</node>
</node>
</node>
<node TEXT="branch" STYLE_REF="списокБезРамки" ID="ID_1964996486" CREATED="1444664223218" MODIFIED="1445006114921">
<node TEXT="просмотр, создание и удаление ветвей" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_354804834" CREATED="1445006194084" MODIFIED="1450109218328"/>
<node TEXT="" LOCALIZED_STYLE_REF="default" ID="ID_206163608" CREATED="1450109227632" MODIFIED="1450109240938">
<icon BUILTIN="info"/>
<node TEXT="перечисление" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_331145182" CREATED="1450109244829" MODIFIED="1450109262079">
<node TEXT="$ git branch
* master
 new" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_403598793" CREATED="1450109301178" MODIFIED="1450109304407"/>
</node>
<node TEXT="создание" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_220325631" CREATED="1450109321022" MODIFIED="1450109329545">
<node TEXT="$ git branch new" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1638127332" CREATED="1450109330849" MODIFIED="1450109341121"/>
</node>
<node TEXT="удаление" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1268111063" CREATED="1450109468277" MODIFIED="1450109528443">
<node TEXT="$ git branch -d new
error: The branch 'new' is not fully merged.
If you are sure you want to delete it, run 'git branch -D new'." LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_660373291" CREATED="1450109742714" MODIFIED="1450109746510"/>
</node>
<node TEXT="переименовать" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1118791114" CREATED="1450109764316" MODIFIED="1450109829013">
<node TEXT="$ git branch -m new_branch
$ git branch
 master
* new_branch" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1985188298" CREATED="1450109830288" MODIFIED="1450109833448"/>
</node>
</node>
</node>
<node TEXT="status" STYLE_REF="списокБезРамки" ID="ID_541843760" CREATED="1444664569060" MODIFIED="1445006114924">
<node TEXT="просмотр статуса проекта" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_621895550" CREATED="1445006213997" MODIFIED="1450101868696"/>
<node TEXT="" ID="ID_1278782300" CREATED="1450103117955" MODIFIED="1450103134064">
<icon BUILTIN="info"/>
<node TEXT="$ git status
On branch master
nothing to commit, working directory clean" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_616918763" CREATED="1450103153919" MODIFIED="1450103179504"/>
<node TEXT="$ git status
On branch master
Untracked files:
 (use "git add <file>..." to include in what will be committed)

new_file_3

nothing added to commit but untracked files present (use "git add" to track)" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_639496699" CREATED="1450103202164" MODIFIED="1450103244740"/>
<node TEXT="$ git status
On branch master
Changes to be committed:
 (use "git reset HEAD <file>..." to unstage)

new file: new_file_3" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_30472462" CREATED="1450103138312" MODIFIED="1450103152575"/>
</node>
</node>
<node TEXT="merge" STYLE_REF="списокБезРамки" ID="ID_335800807" CREATED="1444664577977" MODIFIED="1445006114926">
<node TEXT="объеденить ветки" ID="ID_427135295" CREATED="1445006226153" MODIFIED="1445006239000"/>
</node>
<node TEXT="reset" STYLE_REF="списокБезРамки" ID="ID_1409531648" CREATED="1444916679519" MODIFIED="1445006114928">
<node TEXT="сбросить индекс, удалить из него изменения определенного файла или отменить commit" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_315984450" CREATED="1445006240822" MODIFIED="1450102878160"/>
<node TEXT="" ID="ID_1816356641" CREATED="1450102879503" MODIFIED="1450102884814">
<icon BUILTIN="info"/>
<node TEXT="сбросить текущий индекс" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1601952079" CREATED="1450103002517" MODIFIED="1450103018777">
<node TEXT="$ git status
On branch master
Changes to be committed:
 (use "git reset HEAD <file>..." to unstage)

new file: new_file_3

$ git reset
$ git status
On branch master
Untracked files:
 (use "git add <file>..." to include in what will be committed)

new_file_3

nothing added to commit but untracked files present (use "git add" to track)" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_897169410" CREATED="1450103053553" MODIFIED="1450103057361"/>
</node>
</node>
<node TEXT="ключи" ID="ID_956711419" CREATED="1450103386970" MODIFIED="1450103390278">
<node TEXT="--soft" STYLE_REF="списокБезРамки" ID="ID_823787183" CREATED="1450103658790" MODIFIED="1450105642041">
<node TEXT="$ git commit 
 committed: new file: new_file_3
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 new_file_3
...
$ git reset --soft HEAD^
$ cat > new_file_3
Теперь тут строка
$ git commit -c ORIG_HEAD 
[master 61cd367] add string! 'теперь тут строка'
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 new_file_3" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_739799509" CREATED="1450103710067" MODIFIED="1450103979713"/>
</node>
<node TEXT="--hard" STYLE_REF="списокБезРамки" ID="ID_661426485" CREATED="1450104410546" MODIFIED="1450105638955">
<node TEXT="если комнда достигнет точки ветвления, то удаелния не произойдет" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_138396975" CREATED="1450105608542" MODIFIED="1450105635800"/>
<node TEXT="$ git reset --hard HEAD~1
HEAD is now at 9460ba3 new_file
$ git log
commit 9460ba3b02cb47f5e6de5a0de491f824575e85f0
Author: Artjom <[email protected]>
Date: Mon Dec 14 16:46:33 2015 +0300

 new_file

commit 692c975664ee911aaa522dc33cc5f1544c4fcb30
Author: Artjom <[email protected]>
Date: Mon Dec 14 16:38:14 2015 +0300

 first commit
...
$ git reset --hard HEAD~1
HEAD is now at 692c975 first commit
$ git log
commit 692c975664ee911aaa522dc33cc5f1544c4fcb30
Author: Artjom <[email protected]>
Date: Mon Dec 14 16:38:14 2015 +0300

 first commit" LOCALIZED_STYLE_REF="defaultstyle.note" ID="ID_1030644525" CREATED="1450104507995" MODIFIED="1450104951449"/>
</node>
</node>
</node>
<node TEXT="pull" STYLE_REF="списокБезРамки" ID="ID_278866825" CREATED="1450108350692" MODIFIED="1450108372999"/>
<node TEXT="push" STYLE_REF="списокБезРамки" ID="ID_1020519406" CREATED="1450108363601" MODIFIED="1450108372580"/>
<node TEXT="remote" STYLE_REF="списокБезРамки" ID="ID_756254592" CREATED="1450108366506" MODIFIED="1450108371972"/>
</node>
<node TEXT="конструкции" POSITION="right" ID="ID_1899575398" CREATED="1444919735030" MODIFIED="1444919750420">
<edge COLOR="#00cc66"/>
<node TEXT="навигация" ID="ID_1768247275" CREATED="1444919759968" MODIFIED="1444919766603"/>
</node>
<node TEXT="основные понятия" LOCALIZED_STYLE_REF="AutomaticLayout.level,1" POSITION="left" ID="ID_1753538039" CREATED="1460722988000" MODIFIED="1460723049502">
<edge COLOR="#7c0000"/>
<cloud COLOR="#ffff99" SHAPE="ROUND_RECT"/>
<node TEXT="working directory" ID="ID_1657670480" CREATED="1460723037784" MODIFIED="1460724690498">
<cloud COLOR="#ffcccc" SHAPE="ROUND_RECT"/>
<node TEXT="директория проекта" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_927720318" CREATED="1460723070427" MODIFIED="1460723105409"/>
<node TEXT="там, где происходит непосредственное редактирование файлов" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_943678733" CREATED="1460723106253" MODIFIED="1460723131507"/>
<node TEXT="не отслеживается git" LOCALIZED_STYLE_REF="styles.important" ID="ID_1723587958" CREATED="1460723132461" MODIFIED="1460723143776"/>
</node>
<node TEXT="stage (index)" ID="ID_1251343343" CREATED="1460723205341" MODIFIED="1460724685746">
<cloud COLOR="#ccccff" SHAPE="ROUND_RECT"/>
<node TEXT="те изменеия, которые должны попасть в комит" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1220823048" CREATED="1460723241006" MODIFIED="1460723282058"/>
<node TEXT="так же отсюда можно восстоновить файлы в рабочию директорию" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1422383831" CREATED="1460723283112" MODIFIED="1460723359953"/>
<node TEXT="посредник между историей и раб. директорией" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1999076832" CREATED="1460723519371" MODIFIED="1460723562343"/>
</node>
<node TEXT="history" ID="ID_290329072" CREATED="1460723594945" MODIFIED="1460724702162">
<cloud COLOR="#99ff99" SHAPE="ROUND_RECT"/>
<node TEXT="история коммитов" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1204613692" CREATED="1460724603458" MODIFIED="1460724642398"/>
<node TEXT="дерево изменений со всеми ветками проекта" LOCALIZED_STYLE_REF="defaultstyle.details" ID="ID_1872625812" CREATED="1460724611137" MODIFIED="1460724641460"/>
</node>
</node>
</node>
</map>