author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Tue, 28 Jan 2020 02:19:54 +0200 | |
changeset 2409 | 6163ed9ff6de |
parent 2403 | f5347f511cb3 |
child 2414 | aebcb023e71a |
permissions | -rw-r--r-- |
1002 | 1 |
.. -*- coding: utf-8; -*- |
2 |
||
3 |
====== |
|
4 |
Git. |
|
5 |
====== |
|
1032
4decc3e00bb6
Fix coding and contents.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1002
diff
changeset
|
6 |
.. contents:: |
1905
fba288d59662
Include only local subsections into TOC. This prevent duplication of
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1815
diff
changeset
|
7 |
:local: |
1002 | 8 |
|
2101 | 9 |
Setting up git |
10 |
============== |
|
1002 | 11 |
|
2101 | 12 |
Debian:: |
1002 | 13 |
|
2081
0d9703b4a428
Remove outdated data. Fix formatting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1932
diff
changeset
|
14 |
$ sudo apt-get install git |
1002 | 15 |
|
2101 | 16 |
Cygwin:: |
17 |
||
18 |
$ setup.exe -p git |
|
19 |
$ apt-cyg install git |
|
20 |
||
21 |
After install set up some options:: |
|
1002 | 22 |
|
23 |
$ git config --global user.name "Oleksandr Gavenko" |
|
24 |
$ git config --global user.mail "gavenkoa@gmail.com" |
|
2101 | 25 |
|
26 |
After that you should have:: |
|
27 |
||
1002 | 28 |
$ cat ~/.gitconfig |
29 |
[user] |
|
2101 | 30 |
name = Oleksandr Gavenko |
31 |
mail = gavenkoa@gmail.com |
|
1002 | 32 |
|
33 |
git over proxy. |
|
34 |
=============== |
|
35 |
||
36 |
Only http:// protocol support proxy (not git://):: |
|
37 |
||
38 |
$ export http_proxy="http://username:password@proxy:port/" |
|
39 |
$ git clone http://github.com/$user/$proj.git $proj |
|
40 |
||
41 |
You can store proxy settings under repository local config file:: |
|
42 |
||
43 |
$ git config http.proxy http://$user:$passwd@$ip:$port |
|
44 |
||
2081
0d9703b4a428
Remove outdated data. Fix formatting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1932
diff
changeset
|
45 |
Start project with git |
0d9703b4a428
Remove outdated data. Fix formatting.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1932
diff
changeset
|
46 |
====================== |
1002 | 47 |
|
48 |
Setup proj space on fs:: |
|
49 |
||
50 |
$ mkdir proj |
|
51 |
$ cd proj |
|
52 |
$ git init |
|
53 |
Initialized empty Git repository in /home/user/tmp/proj/.git/ |
|
54 |
$ ls -a |
|
55 |
. .. .git |
|
56 |
||
57 |
Add file, make changes, commit all:: |
|
58 |
||
59 |
$ emacs Makefile |
|
60 |
... C-x C-c |
|
61 |
$ emacs app.c |
|
62 |
... C-x C-c |
|
63 |
$ git add Makefile app.c |
|
64 |
$ git status |
|
65 |
# On branch master |
|
66 |
# |
|
67 |
# Initial commit |
|
68 |
# |
|
69 |
# Changes to be committed: |
|
70 |
# (use "git rm --cached <file>..." to unstage) |
|
71 |
# |
|
72 |
# new file: Makefile |
|
73 |
# new file: app.c |
|
74 |
# |
|
75 |
||
76 |
or just:: |
|
77 |
||
78 |
$ git add . |
|
79 |
||
80 |
Commit newlly added file:: |
|
81 |
||
82 |
$ git commit |
|
83 |
... Write message log ... |
|
84 |
Created initial commit 2169263: My first commit massage. |
|
85 |
1 files changed, 4 insertions(+), 0 deletions(-) |
|
86 |
create mode 100644 app.c |
|
87 |
||
2209 | 88 |
Show difference |
89 |
=============== |
|
90 |
||
91 |
Show difference between index/stage and working tree:: |
|
92 |
||
93 |
$ git diff |
|
94 |
||
95 |
Show difference between ``HEAD`` and index (what is going to be commited):: |
|
96 |
||
97 |
$ git diff --cached |
|
98 |
$ git diff --staged |
|
99 |
||
100 |
.. note:: ``--cached`` and ``--staged`` are synonyms. |
|
101 |
||
102 |
Show difference beetween ``HEAD`` and working tree (what is commited after ``git commit -a``):: |
|
103 |
||
104 |
$ git diff HEAD |
|
105 |
$ git diff HEAD -- $path |
|
106 |
||
107 |
Show difference in changeset:: |
|
108 |
||
109 |
$ git show $hash |
|
110 |
||
111 |
Show difference between revisions:: |
|
112 |
||
113 |
$ git diff $rev1..$rev2 |
|
114 |
$ git diff ORIG_HEAD..HEAD |
|
115 |
||
116 |
https://stackoverflow.com/questions/3293607/difference-between-git-head-and-the-current-project-state |
|
117 |
Difference between git HEAD and the current project state? |
|
118 |
||
1002 | 119 |
Undo tracking added file. |
120 |
========================= |
|
121 |
||
122 |
You do:: |
|
123 |
||
124 |
$ git add badfile |
|
125 |
$ git status |
|
126 |
# On branch master |
|
127 |
# Changes to be committed: |
|
128 |
# (use "git reset HEAD <file>..." to unstage) |
|
129 |
# |
|
130 |
# new file: badfile |
|
131 |
# |
|
132 |
||
133 |
To stop tracking badfile do:: |
|
134 |
||
135 |
$ git rm --cached badfile |
|
136 |
$ git status |
|
137 |
# On branch master |
|
138 |
# Untracked files: |
|
139 |
# (use "git add <file>..." to include in what will be committed) |
|
140 |
# |
|
141 |
# file |
|
142 |
nothing added to commit but untracked files present (use "git add" to track) |
|
143 |
||
144 |
or:: |
|
145 |
||
146 |
$ git reset badfile |
|
147 |
||
2082
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
148 |
Committing changes |
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
149 |
================== |
1002 | 150 |
|
2082
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
151 |
Individual file:: |
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
152 |
|
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
153 |
$ $EDITOR Makefile |
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
154 |
$ git add Makefile |
2152
a48ba30d5b20
Fixed example for done changes review.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2126
diff
changeset
|
155 |
$ git diff --cached |
2082
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
156 |
$ git commit -m "..." |
1002 | 157 |
|
2082
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
158 |
Commit all changed and previously manages files:: |
1002 | 159 |
|
2082
7f6ce6b18a0c
Remove unnecessary details.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2081
diff
changeset
|
160 |
$ git commit -a -m "...." |
1002 | 161 |
|
2084 | 162 |
Managing branches |
163 |
================= |
|
164 |
||
165 |
Print current branch:: |
|
166 |
||
167 |
$ git branch |
|
168 |
||
169 |
List all known branches:: |
|
170 |
||
171 |
$ git branch -a |
|
172 |
||
173 |
List all known remote branches:: |
|
174 |
||
175 |
$ git branch -r |
|
176 |
||
2409
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
177 |
List all remote branches directly from remote:: |
2084 | 178 |
|
179 |
$ git ls-remote |
|
2190 | 180 |
$ git ls-remote origin |
181 |
||
182 |
List registered remotes:: |
|
183 |
||
2409
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
184 |
$ git remote -v |
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
185 |
$ git remote |
2190 | 186 |
$ git remote show |
2084 | 187 |
|
188 |
List remote branches from ``$REMOTE`` remote:: |
|
189 |
||
190 |
$ git ls-remote --heads $REMOTE |
|
191 |
$ git remote show $REMOTE |
|
192 |
||
2190 | 193 |
Special case of above is ``origin`` remote, which is default remote:: |
194 |
||
195 |
$ git remote show origin |
|
196 |
$ git ls-remote --heads origin |
|
197 |
||
2084 | 198 |
.. note:: |
199 |
||
200 |
Look to ``[remote "..."]`` in ``~/.git/config`` to find out names of possible |
|
201 |
remotes. Alternatively get list from:: |
|
202 |
||
203 |
$ git remote show |
|
204 |
||
2190 | 205 |
Getting branches pointers from default (``origin``) remote (without merging |
206 |
tracking branch):: |
|
2084 | 207 |
|
208 |
$ git fetch |
|
209 |
||
210 |
Getting branches pointers from ``$REMOTE`` remote:: |
|
211 |
||
212 |
$ git fetch $REMOTE |
|
213 |
||
2190 | 214 |
To get updated with default remote changes:: |
215 |
||
216 |
$ git pull |
|
217 |
||
218 |
or specify concrete remote:: |
|
219 |
||
220 |
$ git pull $REMOTE |
|
221 |
$ git pull origin |
|
222 |
||
2360
5179f42afc84
Delete remote branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2292
diff
changeset
|
223 |
Delete local branch (``-D`` is unsafe i.e. changes aren't pushed to any remote):: |
2214
f7b3d90697ab
Delete remote branch remotely.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2211
diff
changeset
|
224 |
|
f7b3d90697ab
Delete remote branch remotely.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2211
diff
changeset
|
225 |
$ git branch -d $NAME |
2360
5179f42afc84
Delete remote branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2292
diff
changeset
|
226 |
$ git branch -D $NAME |
2214
f7b3d90697ab
Delete remote branch remotely.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2211
diff
changeset
|
227 |
|
2253 | 228 |
Delete remote branch:: |
2214
f7b3d90697ab
Delete remote branch remotely.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2211
diff
changeset
|
229 |
|
2360
5179f42afc84
Delete remote branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2292
diff
changeset
|
230 |
$ git push $REMOTE --delete $BRANCH_NAME |
5179f42afc84
Delete remote branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2292
diff
changeset
|
231 |
$ git push $REMOTE -d $BRANCH_NAME |
5179f42afc84
Delete remote branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2292
diff
changeset
|
232 |
$ git push origin -d $BRANCH_NAME |
2214
f7b3d90697ab
Delete remote branch remotely.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2211
diff
changeset
|
233 |
|
2190 | 234 |
To locally remove pointers to deleted remotely branches:: |
235 |
||
236 |
$ git remote update --prune |
|
237 |
$ git remote update --prune origin |
|
238 |
||
2084 | 239 |
.. note:: |
240 |
||
241 |
Only curtain branches fetched by default:: |
|
242 |
||
243 |
[remote "origin"] |
|
2123
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
244 |
url = ... |
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
245 |
fetch = +refs/heads/*:refs/remotes/origin/* |
2084 | 246 |
|
247 |
Edit ``fetch`` value to change defaults. |
|
248 |
||
2171
2ded7f1cf6c0
Move branch pointer to arbitrary hash.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2153
diff
changeset
|
249 |
Move branch pointer to arbitrary hash:: |
2ded7f1cf6c0
Move branch pointer to arbitrary hash.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2153
diff
changeset
|
250 |
|
2ded7f1cf6c0
Move branch pointer to arbitrary hash.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2153
diff
changeset
|
251 |
$ git branch -f $NAME $HASH |
2ded7f1cf6c0
Move branch pointer to arbitrary hash.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2153
diff
changeset
|
252 |
|
2409
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
253 |
Create local branch from remote with the same name:: |
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
254 |
|
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
255 |
$ git checkout --track origin/fix |
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
256 |
|
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
257 |
Create local branch from remote with an alternative name:: |
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
258 |
|
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
259 |
$ git checkout -b myfix origin/fix |
6163ed9ff6de
Create local branch from remote with the same name.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2403
diff
changeset
|
260 |
|
2085
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
261 |
git analog of 'hg incoming' |
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
262 |
=========================== |
1002 | 263 |
|
264 |
git does not directly support such feature. You can emulate it by:: |
|
265 |
||
266 |
$ git fetch |
|
267 |
$ git log master..origin/master # or just '..origin/master' |
|
268 |
||
2085
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
269 |
By previous commands you grab changes from remote server! You can apply them by |
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
270 |
``pull`` or ``merge`` or ``rebase`` command:: |
1002 | 271 |
|
2085
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
272 |
$ git pull |
1002 | 273 |
$ git merge |
2085
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
274 |
TODO |
1002 | 275 |
|
2085
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
276 |
To detect if remote repository have new changes:: |
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
277 |
|
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
278 |
$ git ls-remote |
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
279 |
$ git ls-remote $upstream |
652aca73fc06
Detect if remote repository have new changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2084
diff
changeset
|
280 |
|
2126 | 281 |
View git commits |
282 |
================ |
|
283 |
||
284 |
Review specific commit with:: |
|
285 |
||
286 |
$ git show $REV |
|
287 |
$ git diff $REV^ $REV |
|
288 |
||
2292
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
289 |
Review merge commit related to specific parent:: |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
290 |
|
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
291 |
$ git diff $REV^1 $REV |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
292 |
$ git diff $REV^2 $REV |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
293 |
|
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
294 |
$ git diff HEAD^1 HEAD |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
295 |
$ git diff HEAD^2 HEAD |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
296 |
|
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
297 |
.. note:: ``^1`` is the first parent, ``^2`` is the second parent, and so on. |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
298 |
|
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
299 |
``git show`` command for merge commits shows only changes from conflicting hunks. It is equivalent |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
300 |
to (lines that changed as part of the conflict resolution):: |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
301 |
|
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
302 |
$ git diff-tree --cc $REV |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
303 |
|
2126 | 304 |
Review difference between commits:: |
305 |
||
306 |
$ git $REV1 $REV2 |
|
2153
e88e36e73ebc
Review difference between commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2152
diff
changeset
|
307 |
$ git $REV1..$REV2 |
e88e36e73ebc
Review difference between commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2152
diff
changeset
|
308 |
$ git $REV1..$REV2 -- $DIR_OR_FILE |
2126 | 309 |
|
310 |
Review history with diffs:: |
|
311 |
||
312 |
$ git log -p |
|
313 |
$ git log -p $FROM_REV |
|
314 |
||
2292
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
315 |
Review history of merges only:: |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
316 |
|
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
317 |
$ git log --min-parents=2 -p --cc |
cd4554e0150e
Review history of merges only.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2262
diff
changeset
|
318 |
|
2122
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
319 |
View unpublished git commits / analog of git 'hg outgoing' |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
320 |
========================================================== |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
321 |
|
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
322 |
``git`` does not directly support such feature. Recently ``hg`` start tracking |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
323 |
changes that pushed to any other repositories (called as ``public`` versus |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
324 |
``draft`` which is not yet published anywhere). You can emulate it by:: |
1002 | 325 |
|
2122
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
326 |
$ git fetch origin |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
327 |
$ git log origin/master..master |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
328 |
$ git log origin/master.. |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
329 |
$ git log origin/master..HEAD |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
330 |
$ git log @{u}.. |
1002 | 331 |
|
2122
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
332 |
$ git diff origin/master.. |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
333 |
|
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
334 |
Verbose syntax:: |
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
335 |
|
24fbab64cf91
View unpublished git commits.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2116
diff
changeset
|
336 |
$ git log --branches --not --remotes |
1002 | 337 |
|
2123
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
338 |
http://stackoverflow.com/questions/2016901/viewing-unpushed-git-commits |
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
339 |
Viewing unpushed Git commits. |
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
340 |
http://stackoverflow.com/questions/3636914/how-can-i-see-what-i-am-about-to-push-with-git |
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
341 |
How can I see what I am about to push with git? |
f98c2b2e6c07
View unpublished git commits- added links.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2122
diff
changeset
|
342 |
|
2102
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
343 |
git analog of 'hg glog' |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
344 |
======================= |
1650
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
345 |
:: |
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
346 |
|
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
347 |
$ git log --all --graph |
2102
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
348 |
$ git log --all --graph --oneline |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
349 |
$ git log --all --graph --oneline --decorate |
1650
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
350 |
|
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
351 |
Add alias:: |
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
352 |
|
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
353 |
[alias] |
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
354 |
glog = log --all --graph |
a48c3c61d0f9
git analog of 'hg glog'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1641
diff
changeset
|
355 |
|
2116 | 356 |
Git analog of 'hg rollback' |
357 |
=========================== |
|
1651
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
358 |
|
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
359 |
To edit commit message of last commit:: |
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
360 |
|
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
361 |
$ git commit --amend -m "$MSG" |
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
362 |
|
2116 | 363 |
To integrate changes into last commit (``-a`` to avoid antecedent ``git add ...``, |
364 |
``--no-edit`` if you don't like to change commit message, otherwise external |
|
365 |
editor is opened):: |
|
366 |
||
367 |
$ git commit -a --amend --no-edit |
|
368 |
||
1651
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
369 |
To edit messages of old commits starting from ``$REV``:: |
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
370 |
|
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
371 |
$ git rebase -i $REV |
c77807176b36
Git analog of 'hg rollback'
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1650
diff
changeset
|
372 |
|
2124 | 373 |
To undo latest commit:: |
374 |
||
375 |
$ git reset HEAD~1 |
|
376 |
||
2102
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
377 |
Git analog of 'hg root' |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
378 |
======================= |
1771
b2d4be61da16
Git analog of 'hg root'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1714
diff
changeset
|
379 |
:: |
b2d4be61da16
Git analog of 'hg root'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1714
diff
changeset
|
380 |
|
b2d4be61da16
Git analog of 'hg root'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1714
diff
changeset
|
381 |
$ git rev-parse --show-toplevel |
b2d4be61da16
Git analog of 'hg root'.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1714
diff
changeset
|
382 |
|
2102
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
383 |
Making local branch tracking remote |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
384 |
=================================== |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
385 |
:: |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
386 |
|
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
387 |
$ git branch -u upstream/foo |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
388 |
$ git branch -u upstream/foo foo |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
389 |
|
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
390 |
$ git branch --set-upstream-to=upstream/foo |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
391 |
$ git branch --set-upstream-to=upstream/foo foo |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
392 |
|
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
393 |
Showing what and how local branches are tracked:: |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
394 |
|
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
395 |
$ git branch -vv |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
396 |
$ cat .git/gitconfig |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
397 |
|
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
398 |
Showing what remote branches tracked:: |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
399 |
|
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
400 |
$ git remote show $remote |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
401 |
|
2115
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
402 |
Undo mistaken rebase |
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
403 |
==================== |
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
404 |
|
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
405 |
If there are no any ``reset``, ``rebase`` or ``merge`` afterwards the easiest |
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
406 |
way to recode to pre-rebase state is one of:: |
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
407 |
|
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
408 |
$ git rebase --abort |
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
409 |
$ git reset --hard ORIG_HEAD |
0263a79eeb3b
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2102
diff
changeset
|
410 |
|
2172
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
411 |
Otherwise look to:: |
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
412 |
|
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
413 |
$ git reflog |
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
414 |
|
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
415 |
and reset to necessary head:: |
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
416 |
|
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
417 |
$ git reset --hard "HEAD@{...}" |
850d2d84e4c8
Undo mistaken rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2171
diff
changeset
|
418 |
|
2173
69aed373ceb9
Undoing git rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2172
diff
changeset
|
419 |
https://stackoverflow.com/questions/134882/undoing-a-git-rebase |
69aed373ceb9
Undoing git rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2172
diff
changeset
|
420 |
Undoing git rebase. |
69aed373ceb9
Undoing git rebase.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2172
diff
changeset
|
421 |
|
2179 | 422 |
Undo reset --hard |
423 |
================= |
|
424 |
||
425 |
``git reset --hard`` is destructive command without backup data. |
|
426 |
||
427 |
You may find your previously added data in Git garbage:: |
|
428 |
||
429 |
$ git fsck --lost-found |
|
430 |
||
431 |
look to files inside ``.git/lost-found`` directory. |
|
432 |
||
433 |
Reviewing ``git reflog`` also may help. |
|
434 |
||
435 |
* https://stackoverflow.com/questions/5788037/recover-from-git-reset-hard |
|
436 |
* https://stackoverflow.com/questions/14251194/how-to-recover-after-i-execute-git-reset-hard-head |
|
437 |
||
2232
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
438 |
Undo mistaken push |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
439 |
================== |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
440 |
:: |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
441 |
|
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
442 |
$ git reset HEAD^ |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
443 |
$ git push --force |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
444 |
|
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
445 |
Alternative commands may look like:: |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
446 |
|
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
447 |
$ git reset --hard $HASH |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
448 |
$ git push -u origin master --force |
ac7f6d8bea28
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2214
diff
changeset
|
449 |
|
2233
d0c386e6f039
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2232
diff
changeset
|
450 |
You can delete remote branch with syntax of appended colon before branch name:: |
d0c386e6f039
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2232
diff
changeset
|
451 |
|
d0c386e6f039
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2232
diff
changeset
|
452 |
$ git reset HEAD^ |
d0c386e6f039
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2232
diff
changeset
|
453 |
$ git push origin :$NAME |
d0c386e6f039
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2232
diff
changeset
|
454 |
$ git push origin $NAME |
d0c386e6f039
Undo mistaken push.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2232
diff
changeset
|
455 |
|
2175 | 456 |
Git bisect |
457 |
========== |
|
458 |
||
2176 | 459 |
``bad`` changes should be later in graph history then ``good`` ones. To use |
460 |
alternative names:: |
|
461 |
||
462 |
$ git start --term-old=... --term-new=... |
|
2175 | 463 |
|
464 |
Start bisecting with:: |
|
465 |
||
466 |
$ git bisect start |
|
467 |
||
468 |
Mark good and bad revisions:: |
|
469 |
||
470 |
$ git co vBAD |
|
471 |
$ make test |
|
472 |
$ git bisect bad |
|
473 |
||
474 |
$ git co vGOOD |
|
475 |
$ make test |
|
476 |
$ git bisect good |
|
477 |
||
478 |
||
479 |
If build/test failed to complete use:: |
|
480 |
||
481 |
$ git bisect skip |
|
482 |
||
483 |
To restore mistakenly marked revisions:: |
|
484 |
||
485 |
$ git bisect log >$LOG |
|
486 |
$ git bisect reset |
|
487 |
$ $EDITOR $LOG |
|
488 |
$ git bisect replay $LOG |
|
489 |
||
2211 | 490 |
Import patch |
491 |
============ |
|
492 |
||
493 |
Check patch summary:: |
|
494 |
||
495 |
git apply --stat my.patch |
|
496 |
||
497 |
Detect possible errors during patch application:: |
|
498 |
||
499 |
git apply --check my.patch |
|
500 |
||
501 |
Apply patch to working tree without commit:: |
|
502 |
||
503 |
git apply my.patch |
|
504 |
||
505 |
Commit patch:: |
|
506 |
||
507 |
git am my.patch |
|
508 |
||
509 |
Commit patch by signing you as reviewer:: |
|
510 |
||
511 |
git am --signoff my.patch |
|
512 |
||
2102
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
513 |
Debug git network operation |
ce5d8887b874
Making local branch tracking remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2101
diff
changeset
|
514 |
=========================== |
1002 | 515 |
|
516 |
Git uses libcurl for network operation:: |
|
517 |
||
518 |
$ export GIT_CURL_VERBOSE=1 |
|
519 |
$ git ... |
|
520 |
||
1076
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
521 |
Push new repo to remote. |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
522 |
======================== |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
523 |
:: |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
524 |
|
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
525 |
$ mkdir $REPO |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
526 |
$ cd $REPO |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
527 |
$ git init |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
528 |
$ git add . |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
529 |
$ git commit -m "Initial commit" |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
530 |
$ git remote add origin https://$USER:$PASS@$HOST/$REPO |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
531 |
$ git push -u origin master |
9b2eb3c96d84
Push new repo to remote.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1032
diff
changeset
|
532 |
|
1641
04e215a475e0
Show heads in branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1334
diff
changeset
|
533 |
Show heads in branch. |
04e215a475e0
Show heads in branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1334
diff
changeset
|
534 |
===================== |
04e215a475e0
Show heads in branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1334
diff
changeset
|
535 |
:: |
04e215a475e0
Show heads in branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1334
diff
changeset
|
536 |
|
04e215a475e0
Show heads in branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1334
diff
changeset
|
537 |
$ git show-ref --heads -s |
04e215a475e0
Show heads in branch.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1334
diff
changeset
|
538 |
|
1932
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
539 |
Search string in file |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
540 |
===================== |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
541 |
|
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
542 |
To search string in all or specific files or working copy:: |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
543 |
|
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
544 |
$ git grep $PATT |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
545 |
$ git grep -i $PATT -- '*.[ch]' |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
546 |
|
2403
f5347f511cb3
To search for string in commit messages.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2402
diff
changeset
|
547 |
To search for string in commit messages:: |
f5347f511cb3
To search for string in commit messages.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2402
diff
changeset
|
548 |
|
f5347f511cb3
To search for string in commit messages.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2402
diff
changeset
|
549 |
$ git log --grep $PATT |
f5347f511cb3
To search for string in commit messages.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2402
diff
changeset
|
550 |
$ git log --grep $PATT --all |
f5347f511cb3
To search for string in commit messages.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2402
diff
changeset
|
551 |
|
1932
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
552 |
To search in all history:: |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
553 |
|
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
554 |
$ git log -S$PATT |
2195
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
555 |
$ git log --pickaxe-regex=$PATT |
1932
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
556 |
$ git log -G$PATT |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
557 |
$ git grep -i PATT $(git rev-list --all) -- '*.[ch]' |
6b987b040e18
Search string in file
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1912
diff
changeset
|
558 |
|
2195
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
559 |
.. note:: |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
560 |
|
2402 | 561 |
``-G`` search occurences in diff chunks, while ``-S`` detects changes in match count. |
2195
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
562 |
|
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
563 |
https://git-scm.com/book/en/v2/Git-Tools-Searching |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
564 |
Git Tools - Searching. |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
565 |
https://stackoverflow.com/questions/1337320/how-to-grep-git-commit-diffs-or-contents-for-a-certain-word |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
566 |
How to grep Git commit diffs or contents for a certain word? |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
567 |
https://stackoverflow.com/questions/4468361/search-all-of-git-history-for-a-string |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
568 |
Search all of Git history for a string? |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
569 |
https://stackoverflow.com/questions/2928584/how-to-grep-search-committed-code-in-the-git-history |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
570 |
How to grep (search) committed code in the git history? |
3556ec0e48be
Search string in file.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2190
diff
changeset
|
571 |
|
1089
2c23dfe7517e
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1076
diff
changeset
|
572 |
Find most recent tag for revision. |
2c23dfe7517e
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1076
diff
changeset
|
573 |
================================== |
2c23dfe7517e
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1076
diff
changeset
|
574 |
:: |
2c23dfe7517e
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1076
diff
changeset
|
575 |
|
2c23dfe7517e
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1076
diff
changeset
|
576 |
$ git describe $REV |
2c23dfe7517e
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1076
diff
changeset
|
577 |
|
1815
49fb4309d4d0
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1771
diff
changeset
|
578 |
Many projects set tags on branches rather then mainline (for example JS/CSS |
49fb4309d4d0
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1771
diff
changeset
|
579 |
projects perform build and commit binary/minified files, which unnecessary for |
49fb4309d4d0
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1771
diff
changeset
|
580 |
mainline history). In this case review simplifiied history by:: |
49fb4309d4d0
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1771
diff
changeset
|
581 |
|
49fb4309d4d0
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1771
diff
changeset
|
582 |
$ git log --graph --all --decorate --oneline --simplify-by-decoration |
49fb4309d4d0
Find most recent tag for revision.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1771
diff
changeset
|
583 |
|
1714
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
584 |
List tags with dates. |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
585 |
===================== |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
586 |
:: |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
587 |
|
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
588 |
$ git log --tags --simplify-by-decoration --pretty="format:%ci %d" |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
589 |
|
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
590 |
Update to date. |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
591 |
=============== |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
592 |
:: |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
593 |
|
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
594 |
$ git checkout 'master@{1979-02-26}' |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
595 |
$ git checkout 'master@{1979-02-26 18:30:00}' |
eed8cfffa44e
List tags with dates.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1651
diff
changeset
|
596 |
|
1002 | 597 |
Using git to work with SVN offline. |
598 |
=================================== |
|
599 |
||
600 |
Prepare SVN and git utilities:: |
|
601 |
||
602 |
$ sudo apt-get svn git-core git-svn |
|
603 |
||
604 |
Making SVN repo:: |
|
605 |
||
2251 | 606 |
$ cd $HOME/tmp |
607 |
$ svnadmin create svn-repo |
|
608 |
$ svn co file://$HOME/tmp/svn-repo svn-devel |
|
609 |
||
610 |
$ cd svn-devel |
|
611 |
$ mkdir tags trunk branches |
|
612 |
||
613 |
$ svn add * |
|
1002 | 614 |
A branches |
615 |
A tags |
|
616 |
A trunk |
|
2251 | 617 |
|
618 |
$ cd trunk/ |
|
619 |
$ printf "all:\n echo XXX\n" >Makefile |
|
620 |
$ printf "int main() {return 0;}" >main.c |
|
621 |
||
622 |
$ svn add * |
|
623 |
||
624 |
$ cd .. |
|
625 |
||
626 |
$ svn st |
|
1002 | 627 |
A trunk |
628 |
A trunk/main.c |
|
629 |
A trunk/Makefile |
|
630 |
A branches |
|
631 |
A tags |
|
2251 | 632 |
|
633 |
$ svn ci -m init |
|
1002 | 634 |
Adding branches |
635 |
Adding tags |
|
636 |
Adding trunk |
|
637 |
Adding trunk/Makefile |
|
638 |
Adding trunk/main.c |
|
639 |
Transmitting file data .. |
|
640 |
$ svn cp -m v0.0 file://$HOME/tmp/svn/trunk file://$HOME/tmp/svn/tags/v0.0 |
|
641 |
$ svn cp -m v0.1 file://$HOME/tmp/svn/trunk file://$HOME/tmp/svn/branches/v0.1 |
|
642 |
||
643 |
Moving SVN changset to git repo:: |
|
644 |
||
2251 | 645 |
$ cd $HOME/tmp |
646 |
$ git svn init file://$HOME/tmp/svn git-repo |
|
647 |
$ ls -a |
|
1002 | 648 |
. .. .git |
2251 | 649 |
|
650 |
$ git svn fetch |
|
1002 | 651 |
A trunk/main.c |
652 |
A trunk/Makefile |
|
653 |
W: +empty_dir: branches |
|
654 |
W: +empty_dir: tags |
|
655 |
r1 = 52ccd9882979dd53ec198dbac108783ec660410f (git-svn) |
|
656 |
A tags/v0.0/main.c |
|
657 |
A tags/v0.0/Makefile |
|
658 |
r2 = 8ec8a772bb6f37ace56b3649066dc84e481ed427 (git-svn) |
|
659 |
M trunk/Makefile |
|
660 |
r3 = 2c169ff409ed504dd6a092b1e302beb3fd94871e (git-svn) |
|
661 |
A branches/v0.1/main.c |
|
662 |
A branches/v0.1/Makefile |
|
663 |
r4 = e68d76f4ba6beea4b9059c1884c1f38ce10831a7 (git-svn) |
|
664 |
M trunk/Makefile |
|
665 |
r5 = cdde63974454b13ac53f2eeb201aa76c49fd875c (git-svn) |
|
666 |
Checked out HEAD: |
|
667 |
file:///home/sasha/tmp/svn r5 |
|
668 |
||
669 |
or (in old git version):: |
|
670 |
||
671 |
$ git svn clone file://$HOME/tmp/svn git-repo |
|
672 |
||
673 |
Making changes in svn:: |
|
674 |
||
2251 | 675 |
$ cd $HOME/tmp/svn-devel/trunk |
676 |
$ echo ".PHONY: clean" >>Makefile |
|
677 |
$ svn ci -m "Added clean to phony." |
|
1002 | 678 |
Sending trunk/Makefile |
679 |
Transmitting file data . |
|
680 |
Committed revision 6. |
|
681 |
||
682 |
Making committed in git:: |
|
683 |
||
2251 | 684 |
$ cd $HOME/tmp/git-repo/trunk |
685 |
$ echo ".PHONY: all" >>Makefile |
|
686 |
$ echo "int foo(int x) {return x+x;}" >>main.c |
|
687 |
$ git status |
|
1002 | 688 |
# On branch master |
689 |
# Changed but not updated: |
|
690 |
# (use "git add <file>..." to update what will be committed) |
|
691 |
# |
|
692 |
# modified: Makefile |
|
693 |
# modified: main.c |
|
694 |
# |
|
695 |
no changes added to commit (use "git add" and/or "git commit -a") |
|
696 |
$ git commit -a -m "Bug fixed." |
|
697 |
Created commit 222d399: Bug fixed. |
|
698 |
2 files changed, 2 insertions(+), 0 deletions(-) |
|
699 |
||
700 |
Getting changes from SVN to git:: |
|
701 |
||
2251 | 702 |
$ git svn rebase |
703 |
M trunk/Makefile |
|
1002 | 704 |
r6 = 8165e9bfb38e9df09a7313d19606ec227629b670 (git-svn) |
705 |
First, rewinding head to replay your work on top of it... |
|
706 |
Applying Bug fixed. |
|
707 |
error: patch failed: trunk/Makefile:6 |
|
708 |
error: trunk/Makefile: patch does not apply |
|
709 |
Using index info to reconstruct a base tree... |
|
710 |
Falling back to patching base and 3-way merge... |
|
711 |
Auto-merged trunk/Makefile |
|
712 |
CONFLICT (content): Merge conflict in trunk/Makefile |
|
713 |
Failed to merge in the changes. |
|
714 |
Patch failed at 0001. |
|
715 |
||
716 |
When you have resolved this problem run "git rebase --continue". |
|
717 |
If you would prefer to skip this patch, instead run "git rebase --skip". |
|
718 |
To restore the original branch and stop rebasing run "git rebase --abort". |
|
719 |
||
720 |
rebase refs/remotes/git-svn: command returned error: 1 |
|
721 |
$ git add Makefile |
|
722 |
$ git rebase --continue |
|
723 |
Applying Bug fixed. |
|
724 |
||
725 |
and return all from git to SVN:: |
|
726 |
||
2251 | 727 |
$ git svn dcommit |
1002 | 728 |
Committing to file:///home/sasha/tmp/svn ... |
729 |
M trunk/Makefile |
|
730 |
M trunk/main.c |
|
731 |
Committed r7 |
|
732 |
M trunk/main.c |
|
733 |
M trunk/Makefile |
|
734 |
r7 = 68e782c8d06635f2db4dd69b9ca8599f99da22e2 (git-svn) |
|
735 |
No changes between current HEAD and refs/remotes/git-svn |
|
736 |
Resetting to the latest refs/remotes/git-svn |
|
737 |
||
738 |
See what going to SVN repo:: |
|
739 |
||
2251 | 740 |
$ cd $HOME/tmp/svn-devel/trunk |
741 |
$ svn diff -r BASE:HEAD |
|
1002 | 742 |
Index: Makefile |
743 |
=================================================================== |
|
744 |
--- Makefile (working copy) |
|
745 |
+++ Makefile (revision 7) |
|
746 |
@@ -6,4 +6,4 @@ |
|
747 |
.o: .c |
|
748 |
$(CC) $(CFLAGS) -c -o $@ $< |
|
749 |
||
750 |
-.PHONY: clean |
|
751 |
+.PHONY: all clean |
|
752 |
Index: main.c |
|
753 |
=================================================================== |
|
754 |
--- main.c (working copy) |
|
755 |
+++ main.c (revision 7) |
|
756 |
@@ -2,3 +2,4 @@ |
|
757 |
{ |
|
758 |
return 0; |
|
759 |
} |
|
760 |
+int foo(int x) {return x+x;} |
|
761 |
$ svn up |
|
762 |
U Makefile |
|
763 |
U main.c |
|
764 |
Updated to revision 7. |
|
765 |
||
2262
bb7e7ae562c2
Get latest changes from SVN and update Git repo state.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2253
diff
changeset
|
766 |
Get latest changes from SVN and update Git repo state:: |
bb7e7ae562c2
Get latest changes from SVN and update Git repo state.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2253
diff
changeset
|
767 |
|
bb7e7ae562c2
Get latest changes from SVN and update Git repo state.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2253
diff
changeset
|
768 |
$ git svn fetch |
bb7e7ae562c2
Get latest changes from SVN and update Git repo state.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2253
diff
changeset
|
769 |
$ git svn rebase |
bb7e7ae562c2
Get latest changes from SVN and update Git repo state.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
2253
diff
changeset
|
770 |
|
1002 | 771 |
gitk. |
772 |
===== |
|
773 |
||
774 |
gitk - The git repository browser. See gitk(1). |
|
775 |
||
776 |
Installing:: |
|
777 |
||
778 |
$ sudo apt-get instal gitk |
|
779 |
||
780 |
Using:: |
|
781 |
||
782 |
$ cd /path/to/git-repo |
|
783 |
$ gitk |
|
784 |