I made a new remote repository on bitbucket, then cloned it locally.
Made 1 commit and pushed the master branch to remote origin and made sure it's tracking origin/master branch.
Made 5 more commits that I did not push to the remote origin.
Tried interactive rebase. The ui appeared as it should.
I then removed the remote.
Tried interactive rebase again. Got the empty window error.
The command history shows:
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree -c sequence.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase -i --autosquash
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-rebase(1) for details
git rebase <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=<remote>/<branch> master
It seems interactive rebase will only work for repositories that have a remote.
Is that how it should be?
This workflow works for me (no remotes needed):
to figure out which commit (SHA or count) you want to consider your base
git branch RebaseFixup HEAD~3
create a temp RebaseFixup (or whatever name) branch from your rebase point. e.g. you want to rebase from 4 commits ago, doing pick/squash/fixup/etc on the last 3 commits. Use the SHA instead if you wish.
git rebase -i RebaseFixup
do your rebase
git branch -d RebaseFixup
cleanup the temporary branch
If anyone finds a better workflow, please also update the StackOverflow question here: http://stackoverflow.com/questions/30625213/how-do-i-use-gits-interactive-rebase-with-a-local-only-repository-no-remote/30625214#30625214
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs