Who is “us” and who is “them” according to Git?

by

When you merge, us refers to the branch you’re merging into, as opposed to them, the branch to be merged.

When you rebase, us refers the upstream branch, and them is the branch you’re moving about. It’s a bit counter-intuitive in case of a rebase.

The reason is that Git uses the same merge-engine for rebase, and it’s actually cherry-picking your stuff into the upstream branch. us = into, them = from.

More Related Contents:

  1. How do I rename a local Git branch?
  2. How do I check out a remote Git branch?
  3. Commit only part of a file in Git
  4. Git refusing to merge unrelated histories on rebase
  5. How to modify a specified commit?
  6. How to change the author and committer name and e-mail of multiple commits in Git?
  7. How to retrieve the hash for the current commit in Git?
  8. How can I delete a file from a Git repository?
  9. How to recover a dropped stash in Git?
  10. Could not open a connection to your authentication agent
  11. Force “git push” to overwrite remote files
  12. Recovering added/staged file after doing git reset –hard HEAD^?
  13. How do I remove the old history from a git repository?
  14. git-upload-pack: command not found, when cloning remote Git repo
  15. Git pull error: unable to create temporary sha1 filename
  16. Update Git submodule to latest commit on origin
  17. How to change Git log date formats
  18. git:// protocol blocked by company, how can I get around that?
  19. Is it possible to get commit logs/messages of a remote git repo without git clone
  20. What determines default branch after “git clone”?
  21. Why use ‘git rm’ to remove a file instead of ‘rm’?
  22. What’s the difference between Git ignoring directory and directory/*?
  23. When git rebasing two branches with some shared history, is there an easy way to have the common history remain common?
  24. How to filter git diff based on file extensions?
  25. Dynamically Fill Jenkins Choice Parameter With Git Branches In a Specified Repo
  26. Git: How to diff two different files in different branches?
  27. git refusing to fetch into current branch
  28. With GitHub how do I push all branches when adding an existing repo?
  29. What is the difference between `git rebase master` and `git rebase –onto master`?
  30. How to use Git?

Leave a Comment