Lines Matching +full:- +full:- +full:git
4 patches with Gerrit, using Gerrit dependency chains, and managing local git
9 The instructions in [README.md](README.md) using `git cl upload` are preferred
11 review system via `git` if you prefer as follows.
16 [Change-Id commit-msg hook](https://gerrit-documentation.storage.googleapis.com/Documentation/2.14.…
17 This adds a `Change-Id` line to each commit message locally, which Gerrit uses
18 to track changes. Once installed, this can be toggled with `git config
21 To download the commit-msg hook for the Open Screen repository, use the
25 curl -Lo .git/hooks/commit-msg https://chromium-review.googlesource.com/tools/hooks/commit-msg
26 chmod a+x .git/hooks/commit-msg
31 You should run `git cl presubmit --upload` in the root of the repository before pushing for
35 `git cl upload`, which will prompt you to verify the commit message and check
40 …nch, not the commit). See the [git-cl](https://chromium.googlesource.com/chromium/tools/depot_tool…
47 of the commit you are pushing has a Change-Id line, that change will also be the
52 Change-Id: aaa and this is in the process of being reviewed on Gerrit. Now
56 git checkout featureA
57 git checkout -b featureB
58 git branch --set-upstream-to featureA
60 # ... git add ...
61 git commit
64 The git history then looks something like this:
67 ... ---- master
71 B <- HEAD
74 and `git log` might show:
77 commit 47525d663586ba09f40e29fb5da1d23e496e0798 (HEAD -> featureB)
79 Date: Fri Mar 23 10:18:01 2018 -0700
85 Date: Thu Mar 22 13:18:09 2018 -0700
89 Change-Id: aaa
95 git push origin HEAD:refs/for/master
102 ## Examples for maintaining local git history
105 D-E --- feature B
107 A-B-C-F-G-H --- feature A
110 ... ---- master
119 indicates whence those were created. M, N, and O should all have Change-Id
120 lines in them (this can be done with the [commit-msg
121 hook](https://gerrit-documentation.storage.googleapis.com/Documentation/2.14.7/cmd-hook-commit-msg.…
129 git checkout C
130 git checkout -b M
131 git rebase -i origin/master # squash commits
132 # Note: make sure a Change-Id line exists on M at this point since N will need
133 # it. You can git commit --amend with the commit-msg hook active or add it via
134 # git commit --amend after pushing. Don't git commit --amend after creating N
136 git push origin HEAD:refs/for/master
137 git checkout E
138 git checkout -b N
139 git rebase -i C --onto M # squash commits
140 git push origin HEAD:refs/for/master
141 git checkout G
142 git checkout -b O
143 git rebase -i origin/master # squash commits and copy the Change-Id line from M
144 git push origin HEAD:refs/for/master
148 D-E --- feature B
150 A-B-C-F-G-H --- feature A
153 ... ---- master
168 git checkout H
169 git checkout -b P
170 git rebase -i origin/master # squash commits, same note as M about Change-Id
171 git push origin HEAD:refs/for/master
172 git checkout featureB # E
173 git rebase # assume featureA is set as featureB's upstream branch
174 git checkout -b Q
175 git rebase -i H --onto P
176 git push origin HEAD:refs/for/master