squash Questions
2
Solved
I performed multiple merge commits but they should have been merge --squash instead. The conflict resolution took more than a day so I can't afford to redo the merging by hand.
Is there a way to c...
Stillage asked 14/11, 2016 at 11:25
4
Solved
Django documentation says we could delete migrations after squashing them:
You should commit this migration but leave the old ones in place; the
new migration will be used for new installs. Onc...
Expose asked 4/6, 2015 at 0:22
13
Solved
This gives a good explanation of squashing multiple commits:
http://git-scm.com/book/en/Git-Branching-Rebasing
but it does not work for commits that have already been pushed. How do I squash the mo...
25
Solved
How do you squash your entire repository down to the first commit?
I can rebase to the first commit, but that would leave me with 2 commits.
Is there a way to reference the commit before the first...
Emeraldemerge asked 1/11, 2009 at 8:38
46
Solved
How do I squash my last N commits together into one commit?
Duckett asked 4/3, 2011 at 4:11
46
Solved
How do I squash my last N commits together into one commit?
Reger asked 4/3, 2011 at 4:11
46
Solved
How do I squash my last N commits together into one commit?
Nunn asked 4/3, 2011 at 4:11
46
Solved
How do I squash my last N commits together into one commit?
Stovall asked 4/3, 2011 at 4:11
46
Solved
How do I squash my last N commits together into one commit?
Heterocyclic asked 4/3, 2011 at 4:11
46
Solved
How do I squash my last N commits together into one commit?
Frizzly asked 4/3, 2011 at 4:11
2
Solved
In Docker 1.13 the new --squash parameter was added.
I'm now hoping to reduce the size of my images as well as being able to "hide" secret files I have in my layers.
Below you can now see...
Flexile asked 20/1, 2017 at 13:0
6
Solved
I'm trying to understand the difference between a squash and a rebase. As I understand it, one performs a squash when doing a rebase.
Cristobalcristobalite asked 11/3, 2010 at 17:33
3
Solved
As the title says, I am not really clear about the differences between a git merge --squash and a git merge --no-commit.
As far as I understand the help page for git merge, both commands would lea...
5
Solved
I merged an upstream of a large project with my local git repo. Prior to the merge I had a small amount of history that was easy to read through, but after the merge a massive amount of history is ...
2
In our development using GitLab we usually squash commits from feature branches when they are merged in main branch (we use rebase strategy instead of merge if it matters).
But if the commits from ...
Stier asked 19/1, 2023 at 15:22
6
Solved
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...
Embosser asked 26/5, 2017 at 22:9
3
Solved
When I squash commits in a branch (using git rebase -i), I'm always annoyed that the squashed commit is combined with the older commit instead of the newer commit.
I don't understand why it was de...
8
Whilst I am working on new code, I make many small commits to track my changes. My company, however, prefers each feature to be committed as a single commit. So the solution is to squash my entire ...
Nutwood asked 29/12, 2014 at 17:24
8
Solved
I've been using Git Extensions for a while now (it's awesome!) but I haven't found a simple answer to the following:
Sometimes, when typing a commit message, a make a typo. My friend showed me how...
Fly asked 26/5, 2013 at 10:1
3
Solved
I am using git subtree to organize my git repositories. Let's say I have a main repository called repo and a library called lib.
I successfully "imported" the lib repository by squashing its histo...
Shuntwound asked 20/11, 2013 at 17:19
2
I have a fork of another repo @github.
did some code and issued a pull request to upstream
upstream master merged with squash option
now next pull request includes new code and the older commits ...
Rambouillet asked 14/10, 2016 at 19:34
6
I wanted to have a simple solution to squash two merge commits together during an interactive rebase.
My repository looks like:
X --- Y --------- M1 -------- M2 (my-feature)
/ / /
/ / /
a --- ...
Mitten asked 12/11, 2009 at 21:59
4
Solved
Here's a workflow that I commonly deal with at work.
git checkout -b feature_branch
# Do some development
git add .
git commit
git push origin feature_branch
At this point the feature branch is ...
2
I always prefer to rebase -i my changes locally and leave a very clean and useful commit history for my feature branches. This also have the benefit of being able to prune local/remote branches aft...
Winded asked 22/6, 2021 at 0:18
1
My git object graph looks like below. I want to squash commits 2fb14b7, 39224ad, fe9252d, and 3e7a060 into one single commit.
* 650c464 (temp) adding hw2.txt
| * dd3674a (master) added hw3
| | * 8...
1 Next >
© 2022 - 2024 — McMap. All rights reserved.