One thing you can do a squash merge to a temporary branch and then post that change for review. git checkout -b feature git commit -m “start feature” … git commit -m “finish feature” git checkout -b feature-review master git merge –squash feature git commit Now your feature-review branch will contain the same diff relative … Read more
It’s exactly what it says: the changes you’re trying to cherry-pick are already wholly contained in the branch you’re on. I.e. the result of the cherry-pick is no changes. You can create an empty commit with the –allow-empty flag to indicate that you attempted to cherry-pick, but there were no changes to pull in.
I got the same message. And it was because I have managed to get the same Change-Id for two commits. Maybe due to some cherry-picking or similar between my local branches. Solved by removing the Change-Id from the commit message, a new Id then was added by the commit hook.
Pull requests are a simple concept that originated when Git was created but has been taken to different levels since. The essence is that you do not have push rights to the repository you want to contribute on, so instead you fork the repository, making your private copy (a clone already does this btw.) and … Read more
You are right about the first one. Here are the rest of them: Checkout: Fetches the latest changes. You should already have this repo downloaded. It does not merge those new changes but makes your working directory reflect them. And a name-less commit is created to include these changes in your working directory. And a … Read more
Check if your commits have Change-Id: … in their descriptions. Every commit should have them. If no, use git rebase -i to reword the commit messages and add proper Change-Ids (usually this is a SHA1 of the first version of the reviewed commit). For the future, you should install commit hook, which automatically adds the … Read more
Pushing with –no-thin argument works as a workaround for me: git push –no-thin omnigerrit HEAD:refs/for/android-4.4
Comments are published when you make them part of a review. Post a review and the comments will be published with it. (You can score the commit as +0 if you don’t have any opinion either way.)
This feature is standard in the Gerrit UI. On the top right of the UI for a patch, click Download, and you will see something like: When you are navigating the patches you go to the download section and copy the command line command for checking out the patch set, for example like this: git … Read more
The documentation for Gerrit, in particular the “Push changes” section, explains that you push to the “magical refs/for/’branch’ ref using any Git client tool”. The following image is taken from the Intro to Gerrit. When you push to Gerrit, you do git push gerrit HEAD:refs/for/<BRANCH>. This pushes your changes to the staging area (in the … Read more