Git and Gerrit FAQ

Here is a FAQ concerning how to use Git and Gerrit.

Should I use or  ?
?

It says "Please, commit your changes or stash them before you can merge." What do I do?
To discard your changes (and anything you had in the stash): git stash git stash clear Now you can proceed with your pull.

What's the difference between and  ?
The -a option automatically stages all tracked, modified files before the commit, letting you skip the  step unless you need to start tracking new files. A tracked file is a file that was in your last commit.

When should I use rather than just  ?
?

How do I save inline code comments? I can only save them as drafts.

 * ''When I comment on code inline or reply to comments inline I cannot save it properly, just as a draft.

A: It's another of Gerrit's unintuitive parts. You have to click the "review" button back in the change overview page, and the draft inline comments will be attached to your "global" comment when you save it.

What should I put in the cover message when I publish comments?
A: ?

How do I watch changes?
A: You have to watch projects. See Gerrit/watched projects.

How do I link to Gerrit URLs from Wikimedia wikis using internal link syntax?

 * For example, for bugs I can use bug 1234  to produce bug 1234.

A: ?