Lines Matching +full:- +full:- +full:onto +full:- +full:branch

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
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
39 current branch. If you upload again, it uploads on the same issue (which is tied
40 to the branch, not the commit). See the [git-cl](https://chromium.googlesource.com/chromium/tools/d…
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
57   git checkout -b featureB
58   git branch --set-upstream-to featureA
67   ... ----  master
71              B <- HEAD
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
105                   D-E --- feature B
107             A-B-C-F-G-H --- feature A
110   ... ----  master
117 Consider a local repo with a master branch and two feature branches.  Commits M,
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.…
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
138 git checkout -b N
139 git rebase -i C --onto M # squash commits
142 git checkout -b O
143 git rebase -i origin/master # squash commits and copy the Change-Id line from M
148                         D-E --- feature B
150             A-B-C-F-G-H --- feature A
153   ... ----  master
161 (commit P) and feature B being rebased onto A, then uploaded to Gerrit as commit
169 git checkout -b P
170 git rebase -i origin/master # squash commits, same note as M about Change-Id
173 git rebase # assume featureA is set as featureB's upstream branch
174 git checkout -b Q
175 git rebase -i H --onto P