vimdiff
even if the default difftool is another toolgit difftool -t vimdiff
git config --global diff.tool "meld"
git config --global difftool.prompt false
git config --global difftool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"
Using .gitconfig
configuration file located at C:\Users\Username\.gitconfig
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
path = C:\\Program Files (x86)\\Meld\\Meld.exe
.gitconfig
which is located at C:\Users\Admin\.gitconfig
contains user configurations[user]
email = tandilashvilivaleri@gmail.com
name = Valeri Tandilash
[merge]
tool = meld
[mergetool "meld"]
path = C:\\Program Files (x86)\\Meld\\Meld.exe
detached HEAD
state if the HEAD does not point to the most recent commit.
We can go into detached HEAD
if we run the command below (if the commit is not the last one)git checkout ba48ldo
.git / HEAD
If the current branch is master and HEAD
is not detached, then the content of the file will be ref: refs/heads/master
git diff
Shows staged changesgit diff --staged
The same as the above commandgit diff --cached
Shows the difference between the working directory and index (both staged and unstaged files)git diff HEAD
Shows the difference between the commitsgit diff a80982d 17d3352
Shows the difference between login.frm
files from different commitsgit diff a809822 17d3352 login.frm
git push origin new_branch
If the branch does not exist on remote repository, first should be run this command:git push --set-upstream origin new_branch
Alternative of the above command is this command:git push -u origin new_branch
To delete branch new_branch
on remote repositorygit push origin new_branch --delete
login
branchgit branch -d login
Deletes the login
branch (with force mode, which means - the branch will be deleted, even if it's not fully mergedgit branch -D login