Skip to content
GitLab
Next
    • 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
    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 380
    • Issues 380
    • 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
  • #2314
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Allow to preserve merges on rebase

By var... on September 29, 2014 15:44 (imported from Google Code)


What steps will reproduce the problem?

  1. You are working in a branch on busy production repository
  2. Pull remote changes and create a merge commit into master
  3. Push
  4. Someone has done commits in master on remote site and push is declined
  5. Open Sync
  6. You cannot do Fetch&Rebase to redo your work over theirs now, so you have to reset, checkout, pull, merge again and cross fingers that there is no one out there that has done other commits.

What is the expected output? What do you see instead?
If "Fetch&Rebase" has "--preserve-merges" GIT option on rebase command, the life will be much easier.

What version of TortoiseGit and msysgit are you using? On
what operating system?

1.8.11 on Win 8.1 x64
Please provide any additional information below.

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