When will `git pull –rebase` get me in to trouble?

by

It is only an issue if you have only published (pushed) some of your commits, because they would be harder to merge to other repos which have already those commits. Since their SHA1 have changed, Git would try to replay them again on those repos.

If you have not (pushed any of those commits again), any rebase should be safe.

So the issue here is: are you sure that all the local commit you are rebasing are still actually… local?
And are you sure of that ‘git pull --rebase‘ after ‘git pull --rebase‘?

If you are working on a ‘private branch’ (a branch that you never pushed, but only merge or rebase on a public branch, one that you will push), then you are safe to rebase that private branch any time you want.

In the end, it all depends on the workflow of merge you have chosen to establish.

More Related Contents:

  1. Squash my last X commits together using Git
  2. Git refusing to merge unrelated histories on rebase
  3. What is the difference between merge –squash and rebase?
  4. How to squash all git commits into one?
  5. Change first commit of project with Git? [duplicate]
  6. Insert a commit before the root commit in Git?
  7. git rebase, keeping track of ‘local’ and ‘remote’
  8. git cherry-pick says “…38c74d is a merge but no -m option was given”
  9. Does “git fetch –tags” include “git fetch”?
  10. How to rebase many branches (with the same base commit) at once?
  11. How to squash my last x commits together?
  12. Rebasing a Git merge commit
  13. How do I squash my last N commits together?
  14. Squash the first two commits in Git? [duplicate]
  15. How to pull specific directory with git
  16. Pull a certain branch from the remote server
  17. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  18. Git commits are duplicated in the same branch after doing a rebase
  19. Delete local Git branches after deleting them on the remote repo
  20. Hg: How to do a rebase like git’s rebase
  21. How can I make my local repository available for git-pull?
  22. How to merge two branches without a common ancestor?
  23. How to fix commit order in GitHub pull requests, broken by git rebase?
  24. How to undo a git pull?
  25. Git interactive rebase without opening the editor
  26. Git: How to rebase to a specific commit?
  27. Error: Cannot pull with rebase: You have unstaged changes
  28. Is there a way to squash a number of commits non-interactively?
  29. Git rebase branch with all parent branches (or dependent sub-branches)
  30. How do I rebase a chain of local git branches?

Leave a Comment