Let’s say you have a repository in Git. You made a branch, then did some changes both to the master and to the branch. Then, tens of commits later, you …
How to make the current Git branch a master branch? Learn MoreIn this short article, we’ll talk about the different ways to compare branches: you can compare commits, actual changes, or even a specific file on two branches. git diff can show …
How to compare files from two different branches in git? Learn MoreSample query: I have two branches in my Git repository: master seotweaks (created originally from master) I created seotweaks with the intention of quickly merging it back into master. However, that was three months ago …
How to replace the master branch in Git, entirely, from another branch? Learn MoreIf you want to merge project-a into project-b: This method worked pretty well for me, it’s shorter and in my opinion a lot cleaner. In case you want to put project-a into a subdirectory, you …
How to merge two Git repositories? Learn MoreDid You Start ssh-agent? You might need to start ssh-agent before you run the ssh-add command: Note that this will start the agent for msysgit Bash on Windows. If you’re using a different shell or operating …
Could not open a connection to your authentication agent: Error resolved Learn MoreThis is how you do it: Where “my_stash” is the stash name. Some more useful things to know: All the stashes are stored in a stack. Type: This will list down all …
How to name and retrieve a stash by name in git? Learn MoreThis is a question of moving the mistakenly committed files back to the staging area from the previous commit, without canceling the changes done to them. This can be done …
How to remove a file from the last commit in Git? Learn MoreSince git 2.13, there is a command to save a specific path to the stash: git stash push <path>. For example: OLD ANSWER: You can do that using git stash –patch (or git stash …
How to stash a specific file in Git? Learn MoreShort 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 …
When to use Git rebase instead of Git merge? Learn MoreThis article explains how to save HTTPS credentials for pushing commits or in other words, permanently authenticating to git repositories. Since Git 1.7.9 (released 2012), there is a neat mechanism …
How to cache HTTPS credentials for pushing commits? Learn Morewill give you the whole repository. After the clone, you can list the tags with $ git tag -l and then checkout a specific tag: Even better, checkout and create a branch …
How to download a specific tag with Git? Learn MoreThe –no-ff flag prevents git merge from executing a “fast-forward” if it detects that your current HEAD is an ancestor of the commit you’re trying to merge. A fast-forward is when, instead of constructing a merge …
What is the difference between `git merge` and `git merge –no-ff`? Learn MoreQuery explained: I have the folder application/ which I add to the .gitignore. Inside the application/ folder is the folder application/language/gr. How can I include this folder? I’ve tried this with no luck. How to exclude …
.gitignore exclude folder but include specific subfolder Learn MoreSample problem: I clone my repository with: But after I change some files and add and commit them, I want to push them to the server: But the error I get back is: ‘src …
‘src refspec master does not match any’ when pushing commits in Git Learn MoreQuery: How can I stash only one of the multiple changed files on my branch? How to stash only one file in Git? To stash only one file out of …
How to stash only one file in Git? Learn MoreQuery: I started some work on a new feature and after coding for a bit, I decided this feature should be on its own branch. How do I move the …
How to move uncommitted work to a new branch in Git? Learn MoreQuery: How do I remove a Git submodule? By the way, is there a reason I can’t simply do git submodule rm whatever ? How to remove a submodule in Git? Answer …
How to remove a submodule in Git? Learn More