StackOverflow Questions for Tag: rebase

Manishearth

Reputation: 16198

Rebase a branch without checking it out

gitrebase

Score: 92

Answers: 5

Raja

Reputation: 161

Can I use git pull --rebase instead of "git stash git pull git stash pop"?

gitrebasegit-pullgit-stash

Score: 16

Answers: 5

bsethi24

Reputation: 99

After merge to master, rebase with master giving conflicts for all files merged to master

gitbitbucketrebasegit-pull

Score: 0

Answers: 2

Daraan

Reputation: 3947

Keep handled conflicts when rebasing a repository including complete non-linear history

gitgit-mergerebasegit-rebase

Score: -2

Answers: 1

Spring E. Thing

Reputation: 171

How can I rebase a Git branch as though a file was never changed?

gitrebase

Score: -2

Answers: 2

xormapmap

Reputation: 49

Keep branch structure during git rebase

gitrebase

Score: -1

Answers: 1

Kevin2566

Reputation: 451

Git rebase to squash commits reverts local to several commits prior

gitgit-branchrebasegit-rebase

Score: 1

Answers: 1

markdorison

Reputation: 149074

How do I squash my last N commits together?

gitrebasesquashgit-squash

Score: 5685

Answers: 47

Rachel Nicolas

Reputation: 1165

GitLab says merge conflicts must be resolved but there are no conflicts

gitgitlabrebasemerge-conflict-resolutionfast-forward

Score: 0

Answers: 2

Jez

Reputation: 30073

Resolving a 'both added' merge conflict in git?

gitmergerebase

Score: 173

Answers: 3

antoninhrlt

Reputation: 43

Change the git commit author's email but keep the same commit timestamps

gitgithubversion-controltimestamprebase

Score: 1

Answers: 2

Viacheslav Kondratiuk

Reputation: 8889

What git commit practice is better?

gitmergecommitrebasebisect

Score: 10

Answers: 2

ewok

Reputation: 21493

git rebase: fixup commits but use latest message

gitrebase

Score: 7

Answers: 4

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

minitauros

Reputation: 2030

Git: Why does rebase result in conflicts while merge does not?

gitmergerebase

Score: 39

Answers: 3

webmat

Reputation: 60636

Undoing a git rebase

gitrebasegit-rebaseundo

Score: 4413

Answers: 21

SeekanDestroy

Reputation: 611

Rebase and Deployment in GH Actions

githubdeploymentgithub-actionsrebase

Score: 1

Answers: 0

Michael

Reputation: 12072

Change first commit of project with Git?

gitrebasegit-filter-branch

Score: 653

Answers: 4

Nourless

Reputation: 854

git merge changes after previous merge

gitmergepull-requestrebase

Score: 0

Answers: 3

codeforester

Reputation: 43039

Squash gone wrong, how to revert to origin branch?

gitrebasegit-squash

Score: 0

Answers: 0

PreviousPage 1Next

StackOverflow Questions for Tag: rebase

Rebase a branch without checking it out

Can I use git pull --rebase instead of &quot;git stash git pull git stash pop&quot;?

After merge to master, rebase with master giving conflicts for all files merged to master

Keep handled conflicts when rebasing a repository including complete non-linear history

How can I rebase a Git branch as though a file was never changed?

Keep branch structure during git rebase

Git rebase to squash commits reverts local to several commits prior

How do I squash my last N commits together?

GitLab says merge conflicts must be resolved but there are no conflicts

Resolving a &#39;both added&#39; merge conflict in git?

Change the git commit author&#39;s email but keep the same commit timestamps

What git commit practice is better?

git rebase: fixup commits but use latest message

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

Git: Why does rebase result in conflicts while merge does not?

Undoing a git rebase

Rebase and Deployment in GH Actions

Change first commit of project with Git?

git merge changes after previous merge

Squash gone wrong, how to revert to origin branch?

Can I use git pull --rebase instead of "git stash git pull git stash pop"?

Resolving a 'both added' merge conflict in git?

Change the git commit author's email but keep the same commit timestamps

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