Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #158
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Rebase can act on the wrong branch

By jaffathec... on September 07, 2009 14:42 (imported from Google Code)


This bug exists on 1.0.2.0

Current branch: RB_1.6

I opened the rebase menu with the intention of updating my master branch

I set the following options...
Branch: master
UpStream: remotes/origin/master

TortoiseGit tells me:
Branch master behind remotes/origin/master
master will fastforward to remotes/origin/master

When I hit start, it does the following:

Fast forward to remotes/origin/master
git.exe reset --hard remotes/origin/master
HEAD is now at 169f2e8

The problem is, I'm not on the master branch, so it's actually reset my
release branch to be the same as the master.

I guess it needs to switch to the master first.

Thankfully I was able to get my work back via the reflog :)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking