Questions tagged [git-rebase]
With the git-rebase command, you can take the changes from one branch and replay them on top of another branch.
git-rebase
1,715
questions
0
votes
1
answer
31
views
Why does `git pull origin master:master` from non-master branch cause branch to be rebased?
I'm on branch master and do git log
commit 9937b91089895fac45a39a3bda2935e19eb42554 (HEAD -> master, origin/master, origin/HEAD)
...
git status prints
On branch master
Your branch is up to date ...
- 841
2
votes
1
answer
27
views
Git rebase multiple commits with multiple branches
I've got a git dag looking something like:
* commit A - main
|
| * commit B - branch1
| |
| * commit C - branch2
| |
| * commit D
|/
* commit E (this is the old main I worked on top of)
I ...
- 809
-1
votes
2
answers
44
views
How can I remove a change(s) in a previous git commit's history?
I have 3 changes in a commit called B. The changes are C1, C2 and C3 for brevity. My pull request has commits A -> B -> C -> D -> E. I would like to completely remove the changes (...
- 109
1
vote
0
answers
34
views
Git: Want to propagate (rebase) LF vs. CRLF changes through branch revisions
Say, I have a branch with several commits in it.
In versions A and B, I have a file with mixed line endings (mostly LF, but some CRLF), and made various other changes to it.
In version C, I made ...
- 488
1
vote
0
answers
36
views
Why does 'git rebase --strategy-option=theirs master' still conflict?
If I run:
git rebase --strategy-option=theirs master
I expect it to rebase my branch onto master, and resolve any conflicts using my branch.
However I get:
Auto-merging versions.bzl
error: could not ...
- 1,842
1
vote
1
answer
32
views
Problems after accept a pull request doing rebase
Having two problems with pull requests
I have a repository where there is 1 branch called main.
To implements a new feature I create a new branch from the HEAD of main running git checkout -b new-...
- 103
1
vote
1
answer
53
views
git rebase --update-refs diverged my branches
I've been using Stacked Pull-Requests to guide my team members through a feature development.
However, meanwhile some other developer merged his changes in develop so I had to rebase.
This was before ...
- 21
1
vote
1
answer
57
views
Git istructionFormat with padding at the start not working with git rebase interactive
I want to pad spaces on the left of the user name,
[rebase]
instructionFormat = %>(10)%al %as %s
However, the above line does not work, it has no padding effect, but if I add any char on the ...
- 4,072
0
votes
1
answer
41
views
git is trying to merge on 'edit' command during 'git rebase --interactive <commit>'
I have history in git like the following:
<hash2> commit2
<hash1> commit1
<hash0> initial commit
I do git rebase -i <hash0> and choose to edit (pick -> e) both commits (...
- 735
0
votes
0
answers
35
views
In this situation git pull vs git rebase [duplicate]
I am a beginner git user. Please give me advice on the situation below.
1. Create a feature branch to implement functions in the develop branch.
2. Merge a new commit into the develop branch (this ...
- 13
3
votes
1
answer
49
views
How do I use `git commit -v` with `git rebase -i`
When doing a git rebase -i and, say, squashing two commits together, Git will bring up an editor with the commit messages in it for me to edit.
Normally when I do a stand-alone git commit, I use the -...
- 26.7k
0
votes
1
answer
46
views
why does git update-ref also stage the files between old and new commits?
I've a script that refreshes the index to latest commit but git also stages the files changed between the old and new commits which I don't expect.
Steps are as following :
Fetch latest changes from ...
- 984
0
votes
2
answers
120
views
How do I bring changes from a branch to another using IntelliJ?
I am pretty new to git. I wanted to create a project and I'm using IntelliJ to clone my repository. Unfortunately, IntelliJ has its own branch being created (called master). Now I want to submit my ...
- 101
0
votes
0
answers
31
views
How to "rebase" within a branch to an older commit?
I am using commits to push/pull untested and unfinished code to a private, personal work-in-progress remote repo. That is, these commits serve only to synchronize across devices that I'm working on ...
1
vote
2
answers
340
views
copy author and date from other commit, but _not_ the message
In this QA we learn how to use git commit -c or git commit -C to copy the commit metadata from a different commit. This includes author, date and message.
What I would like to do is copy the author ...
- 5,239