aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/documentation/gerrit.md
blob: 4a6b2db39025d6c3460923de0abdfd3b504d3e77 (plain)
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
Using Gerrit without git-cl
===========================

setup
-----

<pre class="code"><code>
cd ...skia_source_dir...

sh [experimental/tools/setup-gerrit](../tools/setup-gerrit)
</code></pre>


creating a change
-----------------

1.  Create a topic branch

        git checkout -b TOPIC -t origin/master

2.  Make some commits.

        echo 1 > whitespace.txt
        git commit -a -m 'Change Foo'
        echo 2 > whitespace.txt
        git commit -a -m 'Change Foo again'

3.  Squash the commits:

        git squash-commits

    This is only needed if you have more than one commit on your branch.

4.  Push to Gerrit

        git gerrit-push-master


updating a change
-----------------


1.  Edit your commits more.

        echo 3 > whitespace.txt
        git amend-head

2.  Re-squash if needed.  (Not needed if you only amended your original commit.)


3.  Push to Gerrit.

        git gerrit-push-master this is a message

    The title of this patchset will be "this is a message".