TL;DR answer: GIT_SEQUENCE_EDITOR=: git rebase -i HEAD~3 You can’t stop git rebase –interactive from running the “sequence editor” (that’s the edit command on the “sequence file” containing the various pick, etc., commands). However, if you examine the interactive rebase script: $ vim $(git –exec-path)/git-rebase–interactive you’ll find code like this near line 230 or so: git_sequence_editor … Read more
The easy way, with a recent-enough Git (this has been out for a long time now so you should have this): git rebase -i –root The other easy way, as twalberg noted in a comment that has since been deleted but is now expanded in https://stackoverflow.com/a/68279810/1256452’s answer, is to use git checkout –orphan to set … Read more
You get that message because you made changes in your local master and you didn’t push them to remote. You have several ways to “solve” it and it normally depends on how your workflow looks like: In a good workflow your remote copy of master should be the good one while your local copy of … Read more
Switch to Branch2 git checkout Branch2 Apply the current (Branch2) changes on top of the Branch1 changes, staying in Branch2: git rebase Branch1 Which would leave you with the desired result in Branch2: a — b — c <– Master \ d — e <– Branch1 \ d — e — f’ — g’ <– … Read more
You can use this with Git v1.7.3 or later versions. git rebase –strategy-option theirs ${branch} # Long option git rebase -X theirs ${branch} # Short option (which is a short for git rebase –strategy recursive –strategy-option theirs ${branch} as stated by the documentation) From Git v1.7.3 Release Notes: git rebase –strategy <s> learned the –strategy-option/-X … Read more
You can run git rebase –interactive and reorder D before B and squash D into A. Git will open an editor, and you see a file like this, ex: git rebase –interactive HEAD~4 pick aaaaaaa Commit A pick bbbbbbb Commit B pick ccccccc Commit C pick ddddddd Commit D # Rebase aaaaaaa..ddddddd onto 1234567 (4 … Read more
It should be pretty obvious from your question that you’re actually just asking about the difference between git merge and git rebase. So let’s suppose you’re in the common case – you’ve done some work on your master branch, and you pull from origin’s, which also has done some work. After the fetch, things look … Read more
This is the same answer as another one of my questions re git troubles. I’m on a mac, and this obscure config change seemed to fix all my woes regarding unstaged changes when there were none. git config –global core.trustctime false I think it’s to do with differences between windows file times, linux file times … Read more
It says: When you save and exit the editor, it will rewind you back to that last commit in that list and drop you on the command line with the following message: $ git rebase -i HEAD~3 Stopped at 7482e0d… updated the gemspec to hopefully work better You can amend the commit now, with It … Read more
For each conflicted file you get, you can specify git checkout –ours — <paths> # or git checkout –theirs — <paths> From the git checkout docs git checkout [-f|–ours|–theirs|-m|–conflict=<style>] [<tree-ish>] [–] <paths>… –ours –theirs When checking out paths from the index, check out stage #2 (ours) or #3 (theirs) for unmerged paths. The index may … Read more