Short Version Merge takes all the changes in one branch and merges them into another branch in one commit. Rebase says I want the point at which I branched to move to a new starting point So when do you use either one? Merge Let’s say you have created a branch for the purpose of … Read more
Pretty Git branch graphs
How can I reset or revert a file to a specific revision?
How do I update or sync a forked repository on GitHub?
When it comes to a range of commits, cherry-picking is was not practical. As mentioned below by Keith Kim, Git 1.7.2+ introduced the ability to cherry-pick a range of commits (but you still need to be aware of the consequence of cherry-picking for future merge) git cherry-pick” learned to pick a range of commits (e.g. … Read more
Given a branch foo and a remote upstream: As of Git 1.8.0: git branch -u upstream/foo Or, if local branch foo is not the current branch: git branch -u upstream/foo foo Or, if you like to type longer commands, these are equivalent to the above two: git branch –set-upstream-to=upstream/foo git branch –set-upstream-to=upstream/foo foo As of … Read more
Amending the most recent commit message git commit –amend will open your editor, allowing you to change the commit message of the most recent commit. Additionally, you can set the commit message directly in the command line with: git commit –amend -m “New commit message” …however, this can make multi-line commit messages or small corrections … Read more
That confusion is acknowledged by Git 2.23. Git 2.23 (Q3 2019) will replace git checkout with two new commands: git switch git restore (illustrated here) See commit 97ed685, commit d16dc42, commit bcba406 (20 Jun 2019), commit 4e43b7f, commit 1235875, commit 80f537f, commit fc991b4, commit 75f4c7c, commit 4df3ec6, commit 2f0896e, commit a5e5f39, commit 3a733ce, commit e3ddd3b, … Read more
Doing this manually is no longer necessary, with modern versions of git! See Malvineous‘s solution, below. Reproduced here: git remote set-url origin –push –add <a remote> git remote set-url origin –push –add <another remote> Original answer: This something I’ve been using for quite a while without bad consequences and suggested by Linus Torvalds on the … Read more
Just calling git rm –cached on each of the files you want to remove from revision control should be fine. As long as your local ignore patterns are correct you won’t see these files included in the output of git status. Note that this solution removes the files from the repository, so all developers would … Read more