All Questions
Tagged with git-squash git-interactive-rebase
5
questions
0
votes
1
answer
238
views
Which one is my previous commit when running interactive rebase?
When I run something like git rebase -i --rebase-merges eeb1425e0 my commits list is showed upside down, i.e., the first commit is the last and the last commit is the first:
pick A Penultimate commit
...
- 9,140
1
vote
1
answer
56
views
Git - How to squash the last commit with ANY other one
Consider the following series of commits on the local branch:
5 Correction of something meaningless, again !
4 Business correction n°3
3 Correction of something meaningless
2 Business correction n°2
...
- 832
20
votes
6
answers
7k
views
git interactive rebase squash into next commit
In Git I can use an interactive rebase to re-write history, this is great because in my feature branch I made a ton of commits with partially working code as I explored different refactors and ways of ...
- 2,160
1
vote
0
answers
292
views
Recover commit list after undoing an interactive rebase in git?
My situation: There are two remotes, origin and fork (the latter is owned by me). I checked out origin/devel, changed some code and committed like 5x to my local branch test. I pushed my commits to ...
- 11.6k
1
vote
3
answers
1k
views
Combining non-linear commits into one commit (sausage making)
Consider the following git history:
* 21f05f9 - Fifth commit
* 0534049 - Fourth commit
* 738ae0a - Third commit
* 288ffd2 - Second commit
* 2535dca - First commit
How would I combine 21f05f9 738ae0a ...
- 3,657