.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
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
vimdiff
even if the default difftool is another toolgit difftool -t vimdiff
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
git mergetool
git config --list
add
commandgit help add / git add --help
does not work on windows
-n
option before running the commandgit clean -n / git clean -fX -n / git clean -fx -n
Deletes untracked files that are not stagedgit clean -f
Deletes ignored files onlygit clean -f -X / git clean -fX
Deletes ignored and non-ignored (untracked files that are not staged) filesgit clean -f -x / git clean -fx
git reset / git reset HEAD / git reset HEAD . / git restore --staged .
Remove index.html
from staging areagit reset index.html / git reset HEAD index.html / git restore --staged index.html