Topic branches are temporary branches that you push to commit a set of
logically-grouped dependent commits:
-To push changes from ``REMOTE/master`` tree to Gerrit for being reviewed as a
+To push changes from ``REMOTE/needlefish`` tree to Gerrit for being reviewed as a
topic in **TopicName** use the following command as an example:
```sh
-$ git push REMOTE HEAD:refs/for/master/TopicName
+$ git push REMOTE HEAD:refs/for/needlefish/TopicName
```
The topic will show up in the review ``UI`` and in the ``Open Changes List``.
-Topic branches will disappear from the master tree when its content is merged.
+Topic branches will disappear from the needlefish tree when its content is merged.
## Finding Available Topics
```sh
-$ ssh -p 29418 <LFID>@gerrit.automotivelinux.org gerrit query \ status:open branch:master| grep topic: | sort -u
+$ ssh -p 29418 <LFID>@gerrit.automotivelinux.org gerrit query \ status:open branch:needlefish| grep topic: | sort -u
```
- [gerrit.automotivelinux.org](https://gerrit.automotivelinux.org) is the
```sh
-$ git log REMOTE/master..master
+$ git log REMOTE/needlefish..needlefish
c0
...
c7
-$ git push REMOTE HEAD:refs/for/master/SOMETOPIC
+$ git push REMOTE HEAD:refs/for/needlefish/SOMETOPIC
```
After you get reviewers' feedback, there are changes in **c3** and **c4** that
changes again:
```sh
-$ git push REMOTE HEAD:refs/for/master/SOMETOPIC
+$ git push REMOTE HEAD:refs/for/needlefish/SOMETOPIC
```
This new push creates a patches revision, your local history is then cleared.
- **reword:** changes the commit message.
- **edit:** changes the commit content.
- **reorder:** allows you to interchange the order of the commits.
-- **rebase:** stacks the commits on top of the master.
+- **rebase:** stacks the commits on top of the needlefish.
## Rebasing During a Pull
-Before pushing a rebase to your master, ensure that the history has a
+Before pushing a rebase to your needlefish, ensure that the history has a
consecutive order.
-For example, your ``REMOTE/master`` has the list of commits from **a0** to
+For example, your ``REMOTE/needlefish`` has the list of commits from **a0** to
**a4**; Then, your changes **c0...c7** are on top of **a4**; thus:
```sh
-$ git log --oneline REMOTE/master..master
+$ git log --oneline REMOTE/needlefish..needlefish
a0
a1
c7
```
-If ``REMOTE/master`` receives commits **a5**, **a6** and **a7**. Pull with a
+If ``REMOTE/needlefish`` receives commits **a5**, **a6** and **a7**. Pull with a
rebase as follows:
```sh
-$ git pull --rebase REMOTE master
+$ git pull --rebase REMOTE needlefish
```
This pulls **a5-a7** and re-apply **c0-c7** on top of them:
```sh
-$ git log --oneline REMOTE/master..master
+$ git log --oneline REMOTE/needlefish..needlefish
a0
...
a7