gerrit – git (pull vs checkout vs cherrypick) which is for what?

You are right about the first one. Here are the rest of them:

  1. Checkout: Fetches the latest changes. You should already have this repo downloaded. It does not merge those new changes but makes your working directory reflect them. And a name-less commit is created to include these changes in your working directory. And a detached HEAD pointing to it. You can merge them at your leisure later.
  2. Pull: Fetches the changes AND merges them into the local branch of the same name.
  3. Cherry-pick: Fetches the commit and plays it on top of the current local branch, thus creating an entirely new commit which happens to have same changes as the one it fetched.

They are a little different than what they actually mean in git. checkout and cherry-pick don’t automatically fetch the changes. checkout just takes HEAD to a commit you specify, thus making working directory exactly as it was at that commit. Likewise, cherry-pick is used to replay commits which you already have local access to.

Related Posts:

  1. How do I delete a Git branch locally and remotely?
  2. What is git tag, How to create tags & How to checkout git remote tag(s)
  3. Difference between “git add -A” and “git add .”
  4. Git: Message ‘src refspec master does not match any’ when pushing commits in Git
  5. What is the best (and safest) way to merge a Git branch into master?
  6. Squash my last X commits together using Git
  7. How to apply a patch generated with git format-patch?
  8. Abort a Git Merge
  9. How to delete a remote tag?
  10. Updates were rejected because the tip of your current branch is behind its remote counterpart
  11. Updating a local repository with changes from a GitHub repository
  12. How do I remove a submodule?
  13. Git push results in “Authentication Failed”
  14. What does “Changes not staged for commit” mean
  15. git: fatal: Could not read from remote repository
  16. Git push results in “Authentication Failed”
  17. Download single files from GitHub
  18. How do I update Homebrew?
  19. Git error when trying to push — pre-receive hook declined
  20. Ignoring directories in Git repositories on Windows
  21. How can I merge multiple commits onto another branch as a single squashed commit?
  22. Gitignore not working
  23. Could not open a connection to your authentication agent
  24. How to get just one file from another branch?
  25. git checkout a single file from another branch and put in different folder
  26. Update Git branches from master
  27. Stash only one file out of multiple files that have changed with Git?
  28. How to find my GitHub username so that I can be found via the URL?
  29. Create a branch in Git from another branch
  30. What is HEAD in Git?
  31. What are the differences between git remote prune, git prune, git fetch –prune, etc
  32. How to get the current branch name in Git?
  33. How can I git stash a specific file?
  34. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  35. How do you stash an untracked file?
  36. Filename too long in Git for Windows
  37. What is the difference between git rm –cached and git reset ?
  38. What does git rev-parse do?
  39. git – pulling from specific branch
  40. How to name and retrieve a stash by name in git?
  41. GitHub: invalid username or password
  42. Why do I have to “git push –set-upstream origin “?
  43. Stash just a single file
  44. Stash just a single file
  45. Git – Ignore node_modules folder everywhere
  46. How do I provide a username and password when running “git clone [email protected]”?
  47. How to undo ‘git reset’?
  48. “*** Please tell me who you are.” when using SSH key
  49. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
  50. fatal: Not a valid object name: ‘master’
  51. Git and nasty “error: cannot lock existing info/refs fatal”
  52. How do I delete a local repository in git?
  53. git pull from master into the development branch
  54. Clone A Private Repository (Github)
  55. Throw away local commits in Git
  56. Hard reset of a single file
  57. How to remove remote origin from a Git repository
  58. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  59. How to clone a specific Git tag
  60. How do I copy a version of a single file from one Git branch to another?
  61. Git: cannot checkout branch – error: pathspec ‘…’ did not match any file(s) known to git
  62. Invalid VCS root mapping – 3 errors on my project
  63. What is the difference between pull and clone in git?
  64. How do I clone a single branch in Git?
  65. Git update submodules recursively
  66. Do a “git export” (like “svn export”)?
  67. how to reset develop branch to master
  68. What does git push origin HEAD mean?
  69. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  70. Git’s local repository and remote repository — confusing concepts
  71. How do I set up Eclipse/EGit with GitHub?
  72. Repository size limits for GitHub.com
  73. How do i git push specific branch?
  74. fatal: could not read Username for ‘https://github.com’: No such file or directory
  75. git push origin master does not work
  76. How can I see which Git branches are tracking which remote / upstream branch?
  77. Could not create work tree dir ‘example.com’.: Permission denied
  78. TortoiseGit-git did not exit cleanly (exit code 1)
  79. How to answer the git prompt in npm init for a local repo
  80. How to `git pull` while ignoring local changes?
  81. Uninitialize git repository
  82. How to create a local branch from an existing remote branch?
  83. Sourcetree adding files in global .gitignore, not in repository .gitignore
  84. git pull remote branch cannot find remote ref
  85. How to configure git bash command line completion?
  86. How do I change the default location for Git Bash on Windows?
  87. How to stop tracking and ignore changes to a file in Git?
  88. Does running git init twice initialize a repository or reinitialize an existing repo?
  89. Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
  90. Git push requires username and password
  91. WordPress with Git
  92. WordPress Git Workflow Help
  93. WordPress and Git – What folders should I track?
  94. Multiple copies of the same website: how to organize code/architecture?
  95. Pull latest stable release via git [closed]
  96. Why do the Roots theme CSS files not load (404)?
  97. Version control with a team of non-developers
  98. Painless way to track remote Git repo for WordPress updates
  99. Questions about Git and WordPress [duplicate]
  100. WordPress on git – need help with configuration

Leave a Comment