All Questions
Tagged with git-squash git-rewrite-history
5
questions
1
vote
1
answer
64
views
Git rebase branch onto squash merge
I did a mess with my features branches. What I had:
master: A - B
\
branch1: E - F
\
branch2: G - H
And then
I squashed and merge ...
- 221
2
votes
2
answers
2k
views
Git interactive rebase did not delete my other commits
I have some commits in my current branch. I want to convert those all commits into one commit and delete all those commits. So I have used the following commands
git rebase -i HEAD~9
Edited all ...
- 798
1
vote
1
answer
326
views
Git "autosquash" without squashing?
Any way to perform an "autosquash" without actually squshing the commits (i.e. just reorder commits marked with --fixup s.t. I can fix the merge conflicts prior to code review)?
- 8,042
0
votes
1
answer
75
views
How to rewrite a whole git history (squashing and rewording) without falling in conflicts?
I am working on code base that has about 5000 commits (including merges). I started interactive rebase to squash similar commits and reword weak commit messages. Before that I deleted some big files ...
- 11.9k
3
votes
3
answers
873
views
git rebase squash take second message (like fixup)
Suppose I have some commits:
<sha1> bug due to function1
<sha2> bug due to function2
... other commits
and I would like to squash commits 1 and 2 together, keeping only the message of ...
- 36.8k