Bug 1604143 Comment 20 Edit History

Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.

Original comment by
on 
I suspect you haven’t set up `central` to track the upstream git server’s `bookmarks/central` branch.

Try maybe the following:

```
% git rebase -i bookmarks/central
```

Hopefully you’re default origin will be the upstream remote, otherwise you need to also append the remote’s name.

You can list your remotes with `git remote -v`.

The relevant subset of my .git/config is:

```
[remote "mozilla"]
	url = hg::https://hg.mozilla.org/mozilla-unified
	fetch = +refs/heads/bookmarks/*:refs/remotes/mozilla/*
	pushurl = ssh://mime.sny.no/git/gecko.git
	pushurl = git@github.com:andreastt/gecko.git

[branch "central"]
	remote = mozilla
	merge = refs/heads/bookmarks/central
	rebase = true
```
Revision 1 by
on 
I suspect you haven’t set up `central` to track the upstream git server’s `bookmarks/central` branch.

Try maybe the following:

```
% git rebase -i bookmarks/central
```

Hopefully your default origin will be the upstream remote, otherwise you need to also append the remote’s name.

You can list your remotes with `git remote -v`.

The relevant subset of my .git/config is:

```
[remote "mozilla"]
	url = hg::https://hg.mozilla.org/mozilla-unified
	fetch = +refs/heads/bookmarks/*:refs/remotes/mozilla/*
	pushurl = ssh://mime.sny.no/git/gecko.git
	pushurl = git@github.com:andreastt/gecko.git

[branch "central"]
	remote = mozilla
	merge = refs/heads/bookmarks/central
	rebase = true
```

Back to Bug 1604143 Comment 20