git-rebase Questions
3
Solved
I have a 'master' branch and several topic branches. Assume that the master branch is used primarily as a release candidate and no development work happens on this branch.
The topic branches are se...
Possessive asked 29/3, 2012 at 6:31
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
5
Solved
Hey I'm new to git and I need to undo a pull, can anyone help?!? So what I've done is...
git commit
git stash
git pull --rebase
git stash pop
this created a bunch of conflicts and went a bit wr...
Chalcocite asked 6/2, 2010 at 13:28
7
Solved
I have made a bunch of unpushed commits in my feature branch and now want to reorder and partly squash belonging commits visually. I reckon the solution somehow lies in the Git interactive, but how...
Blackington asked 4/1, 2017 at 13:16
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
40
Solved
How do I delete a commit from my branch history? Should I use git reset --hard HEAD?
Manana asked 27/8, 2009 at 3:39
9
I have noticed that the two blocks of following git commands have different behaviours and I don't understand why.
I have an A and a B branches that diverge with one commit
---COMMIT--- (A)
\
--- ...
Highpressure asked 28/4, 2015 at 8:20
5
Solved
When I do an interactive rebase, e.g.
git rebase -i HEAD~3
the rebase interactive editor (vim in my case) opens to let me edit the commits to rebase
pick c843ea2 Set Vim column limit to 80 (OS ...
Solution asked 1/12, 2014 at 10:58
18
Solved
I have two branches. Commit a is the head of one, while the other has b, c, d, e and f on top of a. I want to move c, d, e and f to first branch without commit b. Using cherry pick it is easy: chec...
Beneficent asked 4/11, 2009 at 0:7
3
I am having problem with Git rebase that I have to merge the code again and again but still unsuccessful.
I had cut of my branch (A) from master. I started working on my branch and made more commi...
Forbearance asked 3/4, 2015 at 2:35
21
Solved
I managed to create a little mess in my local git repository. I was trying to fix a broken commit by using the following instructions. Before running the "git commit --amend" (and after the git reb...
Sculley asked 10/9, 2010 at 13:37
24
Solved
I accidentally dropped a DVD-rip into a website project, carelessly git commit -a -m ..., and, zap, the repository was bloated by 2.2 GB. Next time I made some edits, deleted the video file, and co...
Spracklen asked 20/1, 2010 at 11:18
8
Solved
Would it make sense to perform git rebase while preserving the commit timestamps?
I believe a consequence would be that the new branch will not necessarily have commit dates chronologically. Is th...
Waterlogged asked 4/6, 2010 at 12:20
9
I'm getting this message when trying to rebase interactively using source tree.
If no other git process is currently running, this probably means a
git process crashed in this repository earlier. ...
Hangman asked 12/4, 2016 at 8:14
2
Solved
I have a very messy git history. I want to squash a bunch of older commits (not including the last one).
I know how to squash my last n commits. But this is different. Here I have commits consecut...
Cuticula asked 22/5, 2019 at 18:10
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
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
6
How can I see how much work is left on a rebase while it's in progress?
I.e. I want to see how much work git has left to check.
Haar asked 8/10, 2015 at 19:11
5
Solved
As Git user I regular come across the situation, that I need to rework one or more commits in a way which do not fit into --amend or rebase -iwith fixup commits. Typically I would do something like...
Ingenuous asked 31/5, 2013 at 13:9
4
You can programmatically edit only the last commit message:
git commit --amend -m 'xxxxxxx'
Or a random commit interactively:
git rebase -i HEAD~n
# Vim opens up, select the commit you want to ...
Lavaliere asked 31/5, 2018 at 21:1
12
Solved
I'd like to rebase to a specific commit, not to a HEAD of the other branch:
A --- B --- C master
\
\-- D topic
to
A --- B --- C master
\
\-- D topic
instead of
A --- B --- C master
\
...
Spurlock asked 12/10, 2011 at 17:27
4
Solved
I'd like to know what the difference is between edit and break in the interactive mode of git rebase -i.
According to the comments, edit uses the commit, but stops for amending, while break stops a...
Jellied asked 18/7, 2020 at 13:59
5
Solved
I'm doing a long git rebase with a lot of commits. I accidentally --skipped a commit where there were some conflicts which I resolved. I should have done git rebase --continue.
Is there are way to...
Jemappes asked 11/2, 2014 at 14:58
6
Solved
Is there some kind of 'git rebase --dry-run', which would notify me of conflicts in advance?
I'm trying to script rebasing and my script will take different paths depending on if the rebase results in any conflicts.
Is there a way to determine if a rebase would result in conflicts before ...
Jameljamerson asked 8/4, 2015 at 14:23
4
Solved
Okay. If I'm on a branch (say working), and I want to merge in the changes from another branch (say master), then I run the command git-merge master while on the working branch, and the changes get...
Whiting asked 4/9, 2011 at 4:14
1 Next >
© 2022 - 2024 — McMap. All rights reserved.