Project

General

Profile

Common git operations » History » Version 15

cryptogopher, 2020-07-10 02:47

1 1 cryptogopher
h1. Common git operations
2
3 5 cryptogopher
{{>toc}}
4 1 cryptogopher
5
Prerequisites:
6
<pre>
7
cd ~/plugins/issue_recurring
8
</pre>
9
10 14 cryptogopher
h2. Issue/pull request resolution in separate branch
11 1 cryptogopher
12 2 cryptogopher
h3. Create separate branch for issue
13 3 cryptogopher
14 2 cryptogopher
# Checkout and update master:
15
<pre>
16
$ git checkout master
17
$ git pull
18
</pre>
19
# Create, checkout new branch and push it to remote (so it will be tracked and replicated on it.michalczyk.pro):
20
<pre>
21
$ git checkout -b issueN
22
$ git push -u origin issueN
23
</pre>
24 9 cryptogopher
# Reload all files open in vim:
25 7 cryptogopher
<pre>
26
:bufdo! e
27
</pre>
28
29 13 cryptogopher
h3. Merge issue/pull request branch into master
30 2 cryptogopher
31
# Push uncommited changes on issue branch.
32 1 cryptogopher
# Checkout and update master:
33
<pre>
34
$ git checkout master
35
$ git pull
36
</pre>
37 13 cryptogopher
# Merge adding comment _closes #N_ (for issue branch), optionally view commits and push issueN/prN branch:
38 1 cryptogopher
<pre>
39
$ git merge issueN
40 13 cryptogopher
$ git log origin/master..HEAD
41 1 cryptogopher
$ git push
42
</pre>
43
# Delete merged branch from local and remote:
44
<pre>
45
$ git branch -d issueN
46
$ git push origin :issueN
47
</pre>
48
# Verify:
49
<pre>
50
$ git branch -a
51
</pre>
52 5 cryptogopher
53 10 cryptogopher
h3. Checkout pull request locally (for editing, testing etc.)
54
55 11 cryptogopher
# Fetch pull request based on its number into new branch and switch to new branch:
56
<pre>
57 12 cryptogopher
$ git fetch origin pull/N/head:prN
58
$ git checkout prN
59
</pre>
60
# (optionally) Push newly created branch:
61
<pre>
62
git push -u origin prN
63 11 cryptogopher
</pre>
64
65 5 cryptogopher
h2. Release
66 4 cryptogopher
67
h3. Move tag to different commit (e.g. after fixing some mistake)
68
69
# Remove tag from remote (if it has been pushed):
70
<pre>
71
git push origin :refs/tags/1.3
72
</pre>
73
# Force replacement of existing tag with one referencing most recent commit:
74
<pre>
75
git tag -fa 1.3
76
</pre>
77
# Push:
78
<pre>
79
git push origin 1.3
80
</pre>