AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

experimental/documentation/gerrit.md

Browse Source 
NOTRY=true
Change-Id: I5f429b48732ca99409cb923c2a3d7bf5f4189d24
Reviewed-on: https://skia-review.googlesource.com/7723
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2017-01-27 13:33:55 -05:00 committed by Skia Commit-Bot
parent 26d3f217bf
commit 2d0c238fcb
1 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
experimental/documentation/gerrit.md Normal file
View File

@ -0,0 +1,59 @@
Using Gerrit without git-cl
===========================
setup
-----
cd ...skia_source_dir...
curl -Lo .git/hooks/commit-msg \
https://skia-review.googlesource.com/tools/hooks/commit-msg
chmod +x .git/hooks/commit-msg
git remote set-url origin https://skia.googlesource.com/skia.git
git config branch.autosetuprebase always
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:
MSG="$(git log --format='%B' ^@{u} @)"
git reset --soft $(git merge-base @ @{u})
git commit -m "$MSG" -e
4. Push to Gerrit
git push origin @:refs/for/master%cc=reviews@skia.org
updating a change
-----------------
1. Edit your commits more.
echo 3 > whitespace.txt
git commit -a --amend --reuse-message=@
2. Re-squash if needed.
3. Push to Gerrit
git push origin @:refs/for/master%m=this_is_a_message