rebase Questions
2
Solved
I had a feature branch:
feature
with lets say 10 commits
then some time ago I started doing experiments on it, but wanted to preserve the current functionality just in case, so I started a new ...
Mccammon asked 20/6, 2016 at 14:33
3
Solved
I always use git commit --verbose. Is there an equivalent option/setting that will make git show me the diff when I'm rewording a commit message during git rebase --interactive?
6
I rebased my branch which had the effect of putting some commits on top of my own. Then realized I had forgotten to squash some commits, so hard reset and squashed. Now I need to bring those commit...
4
I have a feature-branch which is from master some time back. Now, master branch has advanced and feature-branch has many sub-branches on top of it.
I want to have all the new changes from master br...
Karimakarin asked 23/9, 2021 at 7:16
2
Solved
I'm doing this:
git checkout master
git pull
git checkout feature
git rebase origin/master
then resolve all the problems...
Try to push - not gonna happen...
Git is telling me that after doing a r...
4
I often have sub-branches on a branch that I want to rebase onto the mainline. Consider this:
* (Mainline)
*
*
| * (topicA_Branch3)
| *
| *
| * (topicA_Branch2)
| *
| *
| * (topicA_Branch1)
| *
| ...
1
Let's say I have multiple commits, like this:
---A---B---C---D
\
E---F---G
\
H
Now let's say I amend a change to B, creating commit B'
B'
/
---A---B---C---D
\
E---F---G
\
H
How can I re...
4
I have merged 3 different git repos into one
now my history looks something like this:
A1-A2-A3-B1-B2-B3-C1-C2-C3
Now i want to re-order all these commits by date. So finally it may be something ...
Utricle asked 2/12, 2014 at 8:32
1
Solved
Git shows commits in the interactive-rebase todo list (produced by git rebase -i) in the opposite of the usual order: the most ancestral commit (typically, the oldest commit) is shown first, not la...
Boer asked 3/3, 2024 at 14:59
2
I'm trying to following the instructions on https://help.github.com/articles/using-git-rebase-on-the-command-line/ for interactively rebasing from my initial commit (More specifically, I'm trying t...
33
During git rebase origin/development the following error message is shown from Git:
fatal: refusing to merge unrelated histories
Error redoing merge 1234deadbeef1234deadbeef
My Git version is 2....
6
Solved
I made some changes in my master branch and want to bring those upstream. When I cherry-pick the following commits. However, I get stuck on fd9f578 where git says:
$ git cherry-pick fd9f578
fatal: ...
Subdominant asked 10/2, 2012 at 14:26
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
4
Solved
I want to extend on another question I had: Merge two Git repositories and keep the master history
I have succeeded in merging 2 different repo's into one repo. I needed a rebase to do this succes...
Visage asked 17/2, 2017 at 7:45
20
Solved
How do I easily undo a git rebase? A lengthy manual method is:
checkout the commit parent to both of the branches
create and checkout a temporary branch
cherry-pick all commits by hand
reset the f...
Pericarditis asked 25/9, 2008 at 17:59
2
Solved
I try to understand what I am doing wrong but nothing. I am totally confused.
I know that another way to merge branches (or commits) is to use "git rebase".
I have 3 branches: master and 2 others f...
6
Solved
I'm trying to rebase a commit. However, any time I run git rebase -i f83eff3ffc8, for example, a MacVim window opens, that's empty (there is no information in the file). Then once I write and close...
Annulate asked 4/1, 2012 at 7:16
17
Solved
I am fairly new to git, yet currently using it to manage our code in a team environment. I had some rebasing issues, and I fixed them using:
git checkout --ours filename.txt
git add filename.txt
gi...
3
Solved
I'm trying on a certain project to reword the penultimate commit to fix a typo by running git rebase -i HEAD~3, (using the "nano" editor) then changing the default pick option of that commit to r o...
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
1 Next >
© 2022 - 2025 — McMap. All rights reserved.