just playing with tangled
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

docs: add co-located repo hint to Gerrit question

Working with Gerrit requires directly invoking git commands, which is awkward
without a co-located repo. Add a hint to use a co-located repo.

authored by

Michael Pratt and committed by
Philip Metzger
f877dfbe 21aa7655

+11 -7
+11 -7
docs/FAQ.md
··· 158 158 appear in the log, but if they don't you can use `jj branch list`to show all the 159 159 commits associated with it. 160 160 161 - ### How do I integrate Jujutsu with Gerrit? 161 + ### How do I integrate Jujutsu with Gerrit? 162 162 163 163 At the moment you'll need a script, which adds the required fields for Gerrit 164 164 like the `Change-Id` footer. Then `jj` can invoke it via an `$EDITOR` override 165 - in an aliased command. Here's an [example][gerrit-integration] from an 165 + in an aliased command. Here's an [example][gerrit-integration] from an 166 166 contributor (look for the `jj signoff` alias). 167 167 168 - After you have attached the `Change-Id:` footer to the commit series, you'll 169 - have to manually push `git push` your `HEAD` into the remote Gerrit branch 170 - `refs/for/$BRANCH`, where `$BRANCH` is the base branch you want your changes to 171 - go to. 168 + After you have attached the `Change-Id:` footer to the commit series, you'll 169 + have to manually invoke `git push` of `HEAD` on the underlying git repository 170 + into the remote Gerrit branch `refs/for/$BRANCH`, where `$BRANCH` is the base 171 + branch you want your changes to go to (e.g., `git push origin 172 + HEAD:refs/for/main`). Using a [co-located][co-located] repo 173 + will make the underlying git repo directly accessible from the working 174 + directory. 172 175 173 176 We hope to integrate with Gerrit natively in the future. 174 177 175 178 [branches_conflicts]: branches.md#conflicts 176 179 177 180 [change ID]: glossary.md#change-id 181 + [co-located]: glossary.md#change-id 178 182 [commit ID]: glossary.md#commit-id 179 183 [config]: config.md 180 184 181 - [gerrit-integration]: https://gist.github.com/thoughtpolice/8f2fd36ae17cd11b8e7bd93a70e31ad6 185 + [gerrit-integration]: https://gist.github.com/thoughtpolice/8f2fd36ae17cd11b8e7bd93a70e31ad6 182 186 [gitignore]: https://git-scm.com/docs/gitignore 183 187 184 188 [glossary_divergent_change]: glossary.md#divergent-change