Stack Overflow
Stack Overflow

Questions tagged [squash]

Term used in version control systems that means combining several commits into one. Most often seen with git.

See Git - Tools - Rewriting History: squashing.

253 questions
0
votes
1 answer

How to cleanup git history removing certain commits after they've been pushed?

What I'm trying to do: I completed a feature. git add -A; git commit -m "feature A complete" Then I realized I missed some things. git add -A; git commit -m "feature A missed something 1" git add -A; git commit -m "feature A missed something 2" git…
Alex Cory
  • 7,411
  • 6
  • 42
  • 53
0
votes
1 answer

Is there a way to automate the tests results in Squash TM?

I would like to know if it is possible to import tests results from Jenkins to Squash TM ? Or is there any way to import tests results to Squash after an automated test ? (to do that, TestLink for example has a special attribute class to deal with…
Laura G
  • 155
  • 13
0
votes
1 answer

Squashing commits while merging a branch from a separate fork

How do I merge a branch from a fork into the current master while simultaneously squashing the commits, without asking the fork maintainer to do it for me? For example, if my project is hosted at acme/helloworld:master and the fork is at…
Mark
  • 57,724
  • 41
  • 114
  • 149
0
votes
1 answer

How to squash non-sequential commits

I have a feature branch that I've been doing work on and committing at save points along the way. During this process, I had to merge the develop branch into my feature branch to pick up some bug fixes that another developer did. So my commit…
Scott
  • 13,201
  • 20
  • 86
  • 146
0
votes
1 answer

How to squash git commits after doing a merge

I have a pull request where my original commit wasn't passing tests. I didn't look at it for a while and came back to it after a number of months. During this time the upstream repo had done a bunch of commits, so I merged them into my repo. I then…
Noodles
  • 858
  • 3
  • 13
  • 29
0
votes
2 answers

Squashing in git after many commits

I am naive in github ,I have been trying to squash the commits i have done previously on remote .But there are two problems 1)Other contributors are contributing continuously ,hence there are many commits above my commit 2)My commits are not seen in…
aayush
  • 65
  • 1
  • 5
0
votes
1 answer

Using Gerrit to enforce linear history

I work on a large team and to help improve stability and ease of reverting we want to enforce all topic branches to be rebased and squashed before merging into our master branch. The problem is that members of our team are uncomfortable with a…
Jonathan.Brink
  • 19,445
  • 13
  • 59
  • 98
0
votes
1 answer

Squash and Stretch ball animation in Java

So im new to Java programming and i was trying to find an example code of Ball animation in 3D with accurate physics involved. This is the source: http://www.java2s.com/Code/Java/3D/AnimationandInteractionaBouncingBall.htm And here is the error:…
Љубен Јоскоски
  • 1
0
votes
2 answers

"Flatten" Commit History using TortoiseGit

I have a bunch of commits to master that I would like to "flatten" into one big commit in order to reduce the repository size. I would like to do this using TortoiseGit. I haven't been able to find any examples that I could understand using…
Gary LaFayette
  • 1
  • 1
0
votes
0 answers

git: two user's mentioned in one commit

I am trying to correctly rebase a git history that has been already pushed to the remote. Everything has worked as expected, except there is a mysterious "two users" mentioned in the commits that I squash-ed. The diff of this commit matches that of…
arhoskins
  • 352
  • 2
  • 13
0
votes
0 answers

Git: How to squash into a new branch

My team wants me to squash, but sometimes they want me to split it again (per certain aspects). After squash (git rebase -i), the branch moves and the old commits are left in "vacuum". I would like to leave the branch on the old unsquashed commits,…
Ondra Žižka
  • 36,997
  • 35
  • 184
  • 250
0
votes
1 answer

Git: Squashing a range of commits without flattening the history elsewhere

I have a project with a messy history which gets messier the further back into the past you look. What I am trying to do is to preserve everything up to a specific commit, and squash everything from that commit onward. So in the following scheme, I…
principal
  • 433
  • 1
  • 6
  • 12
0
votes
0 answers

Can't squash commit: it is not there

I have a set of commits I want to squash. I know that there is one that, upon running git rebase --interactive startingCommitHash doesn't appear at all, so to address the problem I've decided to start squashing one by one from the tail so that when…
Jorge Antonio Díaz-Benito
  • 1,016
  • 12
  • 32
0
votes
2 answers

Remove/squash entries in a vertical hash

I have a grid that represents an X, Y matrix, stored as a hash here. Some points on the X Y matrix may have values (as type string), and some may not. A typical grid could look like this: {[9, 5]=>"Alaina", [10, 3]=>"Courtney", [11, 1]=>"Gladys",…
EarlyPoster
  • 988
  • 1
  • 9
  • 27
0
votes
1 answer

Fixing a git mess during a Pull Request

I have a large series of git commits made during a pull request for a github project. I've been asked to squash all of the commits together, however since then I have made an incredible mess of merges, resets and accidentally merging over other…
mindTree
  • 786
  • 7
  • 18
1 2 3
…
16
17