It’s not about a plugin. It’s about prompt tricks in the shell. For a cool setup in bash, check out the dotfiles project of this guy: To get a fancy prompt, include the .bash_prompt in your ~/.bash_profile or ~/.bashrc. To get the exact same prompt as in your question, change the export PS1 line at the end of .bash_prompt like this: I ended up using all … Read more
git stash pop throws away the (topmost, by default) stash after applying it, whereas git stash apply leaves it in the stash list for possible later reuse (or you can then git stash drop it). This happens unless there are conflicts after git stash pop, in which case it will not remove the stash, leaving it to behave exactly like git stash apply. Another … Read more
If you’re using GitHub for Windows, git.exe may not be in your PATH, but you may find it in a location like: C:\Users\<username>\AppData\Local\GitHub\PortableGit_<numbersandletters>\bin\git.exe That’s the situation for me, in Windows 7 + version 1.0 of GitHub for Windows. In Windows 10 it appears to be in: C:\Users\<username>\AppData\Local\GitHub\PortableGit_<numbersandletters>\cmd\git.exe ( \cmd versus \bin) From GitHub Desktop 1.1 The UI is different … Read more
fetch, merge, and pull git fetch and git merge origin/master will fetch & integrate remote changes. Let me explain a common scenario. origin/master is at C. Someone pushed D. You worked on E & F. Note that you will not see D in your local repository until you run git fetch. Now you run git fetch. Now you can see … Read more
As Roland mentioned in their answer, it’s a warning that the ssh-agent doesn’t understand the format of the public key and even then, the public key will not be used locally. However, I can also elaborate and answer why the warning is there. It simply boils down to the fact that the PuTTY Key Generator generates two different public key formats depending on … Read more
This is the safest solution: Now you can do whatever you want without fear of conflicts. For instance: If you want to include the remote changes in the master branch you can do: This will make you branch “master” to point to “origin/master”.
UPDATE: You can add other branches to exclude like master and dev if your workflow has those as a possible ancestor. Usually I branch off of a “sprint-start” tag and master, dev and qa are not ancestors. First, list locally-tracking branches that were merged in remote (you may consider to use -r flag to list … Read more
Commit will simply make record of your changes that you have made on your local machine. It will not mark the change in the remote repository. Commit and Push will do the above and push it to the remote repository. This means that any changes you have made will be saved to the remote repository … Read more
.gitignore files are hidden on *nix operating systems because of their dot prefix (link). However you can access them as normal from the shell. e.g. nano .gitignore.
I am using SourceTree for my GIT repositories. Today I need to ignore some files; when I added these files to ignore list from SourceTree’s “Ignore file” menu and check local .gitignore file, the ignored files are not listed there. Instead these are listed in the global .gitignore. How can I get SourceTree to add … Read more