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 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
  • #1231
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

incorrect beahavior of squash in rebase/cherry pick

By Borisov.Ger... on June 19, 2012 11:01 (imported from Google Code)


I try to do rebase as described at http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits

What steps will reproduce the problem?

  1. Create a new branch, and commit to it 3 times, with messages "one", "two" and "three"
  2. Fetch origin/master and try rebase your changes to master
  3. In "Rebase" window set command "squash" for "two" and "three" commits, commit "one" stay with "pick".
  4. Execute rebase.

What is the expected output? What do you see instead?
As described in book, I will take 1 commit that include combination of 3 commits, but I have 2 commits, first is copy of "one", and second is combination of "two" and "three".

What version of the product are you using? On what operating system?
TortoiseGit 1.7.8.0, msysgit 1.7.9, Win2003 x32

Please provide any additional information below.
Console git work correctly.

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