StackOverflow Questions for Tag: git-rebase

Piotr Siupa

Reputation: 4838

Rename detection makes `git rebase` remove a random file

gitgit-mergegit-rebase

Score: -2

Answers: 3

David Kuridža

Reputation: 7207

git rebase basics

gitgit-rebase

Score: 95

Answers: 5

machineghost

Reputation: 35795

Is there a way to list the commit's author in `git rebase -i` (interactive)?

gitgit-rebase

Score: 71

Answers: 3

Kevin2566

Reputation: 451

Git rebase to squash commits reverts local to several commits prior

gitgit-branchrebasegit-rebase

Score: 1

Answers: 1

David Szklarzewski

Reputation: 41

VScode can't open git-rebase-todo

visual-studio-codegit-rebase

Score: 4

Answers: 1

n0tis

Reputation: 828

Git rebasing attribute the change to the wrong file

gitgit-rebase

Score: 4

Answers: 1

Ivin

Reputation: 4825

Is there a difference between git rebase and git merge --ff-only

gitgit-mergegit-rebase

Score: 185

Answers: 3

opticyclic

Reputation: 8136

How Can I Convert Tabs To Spaces Using Rebase?

gitgit-rebasegit-rewrite-history

Score: 1

Answers: 1

Mark

Reputation: 1852

Why does 'git rebase --strategy-option=theirs master' still conflict?

gitgit-rebase

Score: 2

Answers: 1

Some Guy

Reputation: 554

Git: Want to propagate (rebase) LF vs. CRLF changes through branch revisions

gitnewlinegit-mergegit-rebasegit-diff

Score: 2

Answers: 1

user21262497

Reputation:

unexpected commits records from another merged branch emerged after merging main on a branch

gitgit-mergegit-rebasegit-merge-conflict

Score: 1

Answers: 1

stucash

Reputation: 1268

Git Rebase Dilemma: Sort out the tangled feature branches

gitgit-mergegit-rebasegit-merge-conflict

Score: 1

Answers: 1

Milenko Markovic

Reputation: 71

Why do I get "invalid command 'git'" after editing the "rebase todo" and trying to continue?

gitgit-rebase

Score: 1

Answers: 2

nrofis

Reputation: 9796

git error: Your local changes to the following files would be overwritten, to file that wasn't change on remote

gitgit-mergegit-rebase

Score: 1

Answers: 1

jhogendorn

Reputation: 6140

Git rebase fails, 'Your local changes to the following files would be overwritten by merge'. No local changes?

gitgit-rebase

Score: 132

Answers: 4

Camden Narzt

Reputation: 2013

Git rebase over a commit that extracts files into submodule

gitgit-submodulesgit-rebase

Score: 0

Answers: 1

packoman

Reputation: 1282

How to rebase a git branch that contains a merge commit and corresponding, previous branch-point

gitrebasegit-rebase

Score: 1

Answers: 1

Pavel

Reputation: 1127

$REMOTE point to different branches in git merge vs. rebase?

gitgit-bashgit-mergegit-rebasekdiff3

Score: 1

Answers: 1

Steve Bennett

Reputation: 126607

Smarter rebase avoiding redundant work (conflict resolution)?

gitgit-rebasegit-diffgit-merge-conflict

Score: 24

Answers: 4

Chris Maes

Reputation: 37792

git rebase squash take second message (like fixup)

gitgit-rebasegit-rewrite-historygit-squash

Score: 4

Answers: 4

PreviousPage 2Next

StackOverflow Questions for Tag: git-rebase

Rename detection makes `git rebase` remove a random file

git rebase basics

Is there a way to list the commit&#39;s author in `git rebase -i` (interactive)?

Git rebase to squash commits reverts local to several commits prior

VScode can&#39;t open git-rebase-todo

Git rebasing attribute the change to the wrong file

Is there a difference between git rebase and git merge --ff-only

How Can I Convert Tabs To Spaces Using Rebase?

Why does &#39;git rebase --strategy-option=theirs master&#39; still conflict?

Git: Want to propagate (rebase) LF vs. CRLF changes through branch revisions

unexpected commits records from another merged branch emerged after merging main on a branch

Git Rebase Dilemma: Sort out the tangled feature branches

Why do I get &quot;invalid command &#39;git&#39;&quot; after editing the &quot;rebase todo&quot; and trying to continue?

git error: Your local changes to the following files would be overwritten, to file that wasn&#39;t change on remote

Git rebase fails, &#39;Your local changes to the following files would be overwritten by merge&#39;. No local changes?

Git rebase over a commit that extracts files into submodule

How to rebase a git branch that contains a merge commit *and* corresponding, previous branch-point

$REMOTE point to different branches in git merge vs. rebase?

Smarter rebase avoiding redundant work (conflict resolution)?

git rebase squash take second message (like fixup)

Is there a way to list the commit's author in `git rebase -i` (interactive)?

VScode can't open git-rebase-todo

Why does 'git rebase --strategy-option=theirs master' still conflict?

Why do I get "invalid command 'git'" after editing the "rebase todo" and trying to continue?

git error: Your local changes to the following files would be overwritten, to file that wasn't change on remote

Git rebase fails, 'Your local changes to the following files would be overwritten by merge'. No local changes?

How to rebase a git branch that contains a merge commit and corresponding, previous branch-point