.git is initialized by git init. .git contains all information required for version control. If you want to clone your repo, copy .git is enough. 4 sub-directories: hooks/ : example scripts info/ : exclude file for ignored patterns objects/ : all “objects” refs/ : pointers to commit objects 4 files: HEAD : current branch config : configuration options … Read more
On Linux On most distributions, git completion script is installed into /etc/bash_completion.d/ (or /usr/share/bash-completion/completions/git) when you install git, no need to go to github. You just need to use it – add this line to your .bashrc: In some versions of Ubuntu, git autocomplete may be broken by default, reinstalling by running this command should fix it: On Mac … Read more
git branch with no arguments displays the current branch marked with an asterisk in front of it: In order to not have to type this all the time, I can recommend git prompt: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh In the AIX box how I can see that I am using master or inside a particular branch. What changes inside .git … Read more
It should just be: –cached means show the changes in the cache/index (i.e. staged changes) against the current HEAD. –staged is a synonym for –cached. –staged and –cached does not point to HEAD, just difference with respect to HEAD. If you cherry pick what to commit using git add –patch (or git add -p), –staged will return what is staged.
When you fetch you get the remote branches, but you still need to merge the changes from the remote branch into your local branch to see those changes. After fetching, try this: Do you see the difference? Now do: You should see remote changes in the newbranchname. You can also merge those changes into your … Read more
Be careful – you have case mixing between local and remote branch! Suppose you are in local branch downloadmanager now (git checkout downloadmanager) You have next options: Specify remote branch in pull/push commands every time (case sensitive):git pull origin DownloadManagerorgit pull origin downloadmanager:DownloadManager Specify tracking branch on next push:git push -u origin DownloadManager(-u is a short form of –set-upstream)this will persist downloadmanager:DownloadManager link … Read more
If you always want your server version to reflect a commit from your repo, it’s probably better to use git reset instead of git pull – that way you never invoke merge functionality, but instead set all of the files to exactly what they are in the commit you reset to. For example:
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