×
Clear all filters including search bar
Valeri Tandilashvili's Personal Professional Blog
Results: 1022
git config --list
Lists all of our configuration values
git config --list
git mergetool
Opens up the default mergetool (for resolving conflicts)
git mergetool
configure "meld" as default mergetool
Using git console
git config --global merge.tool "meld"
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false
git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"
Using 
.gitconfig
configuration file located at 
C:\Users\Username\.gitconfig
[merge]
	tool = meld
[mergetool]
	prompt = false
	keepBackup = false
[mergetool "meld"]
	path = C:\\Program Files (x86)\\Meld\\Meld.exe
view differences in "vimdiff"
View differences in 
vimdiff
even if the default difftool is another tool
git difftool -t vimdiff
configure "meld" as default difftool
Using git console
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 
.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
file types that .gitignore should contain
detached HEAD in git
We are in 
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
HEAD in git
HEAD reference location:
.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 unstaged changes
git diff
Shows staged changes
git diff --staged
The same as the above command
git diff --cached
Shows the difference between the working directory and index (both staged and unstaged files)
git diff HEAD
Shows the difference between the commits
git diff a80982d 17d3352
Shows the difference between 
login.frm
files from different commits
git diff a809822 17d3352 login.frm
Results: 1022