Lines Matching +full:- +full:- +full:head +full:- +full:branch

1 Using Gerrit without git-cl
5 -----
9 This command sets up a Git commit-message hook to add a unique Change-Id to
10 each commit.  Gerrit only accepts changes with a Change-Id and uses it to
13     experimental/tools/set-change-id-hook
20     git remote set-url origin 'https://skia.googlesource.com/skia.git'
24 --------------
26 Go to [skia.googlesource.com/new-password](https://skia.googlesource.com/new-password)
31 -----------------
33 1.  Create a topic branch
35         git checkout -b TOPIC
37     You may want to set a tracking branch at this time with:
39         git checkout -b TOPIC -t origin/main
44         git commit --all --message 'Change Foo'
45         git log -1
47     `git log` should show that a Change-Id line has been added you your commit
51 3.  If You have multiple commits in your branch, Gerrit will think you want
59     `@` is shorthand for `HEAD`, introduced in git v1.8.5.
61     If you want to target a branch other than `main`, that can be specified
66 …[Gerrit Upload Documentation](https://gerrit-review.googlesource.com/Documentation/user-upload.htm…
70         bin/sysopen https://skia-review.googlesource.com/c/skia/+/$(bin/gerrit-number @)
73 -----------------
79         git commit --all --amend
84 2.  Re-squash if needed.  (Not needed if you only amended your original commit.)
99 Triggering Commit-Queue Dry Run when you upload a patch
100 -------------------------------------------------------
103     git push origin @:refs/for/main%l=Commit-Queue+1,m=$M
107 ------------------
109 On your current branch, after uploading to gerrit:
111     git cl issue $(bin/gerrit-number @)
117 ---------
121     git config alias.gerrit-push 'push origin @:refs/for/main'
123 The following alias amends the head without editing the commit message:
125     git config alias.amend-head 'commit --all --amend --reuse-message=@'
129     git config alias.setcl '!git-cl issue $(bin/gerrit-number @)'
131 The following shell script will squash all commits on the current branch,
132 assuming that the branch has an upstream topic branch.
135         local MESSAGE="$(git log --format=%B ^@{upstream} @)"
136         git reset --soft $(git merge-base @ @{upstream})
137         git commit -m "$MESSAGE" -e
145         local MESSAGE="$(echo $*|sed 's/[^A-Za-z0-9]/_/g')"
151 …git config alias.squash-branch '!M="$(git log --format=%B ^@{u} @)";git reset --soft $(git merge-b…
153 …git config alias.gerrit-push-message '!f(){ git push origin @:refs/for/main%m=$(echo $*|sed "s/[^A…
155 If your branch's upstream branch (set with `git branch --set-upstream-to=...`)
156 is set, you can use that to automatically push to that branch:
159         local UPSTREAM_FULL="$(git rev-parse --symbolic-full-name @{upstream})"
162             (*) echo "Set your remote upstream branch."; return 2;;
167         local MESSAGE="$(echo $*|sed 's/[^A-Za-z0-9]/_/g')"
174 …-push '!f()(F="$(git rev-parse --symbolic-full-name @{u})";case "$F" in (refs/remotes/*);;(*)echo …