#compare version of a file below exemple to compare local with 2 commit before #list files changed $ git diff - name - only HEAD HEAD ~ 3 $ git reset -hard HEAD~1 COMPARE AND FIX CONFLICTS $ git branch -d REVERT ALL CHANGES NOT COMMITTED # if no more work on this branch, create tag and delete branch $ NOT WORKING USE GIT LAB MERGE REQUEST git merge -squash -edit -m 'VACCO-xxxx Merge branch ‘’' $ git merge -no-ff -edit -m 'VACCO-xxxx Merge branch ‘’'

$ git commit -a -m 'VACCO-xxxx Merge master to branch ''' #if you have merge conflict fix it using COMPARE AND FIX CONFLICTS paragraph then commit the changes $ git merge -m 'VACCO-xxxx Merge master to branch ''' origin/master $ git commit –a –m “VACCO-xxxx my message“ # WARNING: any local changes to the files will be lost. # git thinks all files are deleted, this reverts the state of the repo to HEAD. $ mv existing-dir/existing-dir.tmp/.git existing-dir/ git folder to the directory with the files. $ git clone -no-checkout repo-to-clone existing-dir/existing- dir.tmp # might want -no-hardlinks for cloning local repo # `existing-dir`) into an empty temporary directory git folder (excluding files as they are already in $ git config -global credential.helper store

name = Sebastien Blanchard email = helper = manager default = simple excludesfile = ~/.gitignore_global editor = gvim autocrlf = false safecrlf = false st = status -ignore-submodules=all stat = status -ignore-submodules=all ci = commit lg = log -color -graph -pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue) %Creset' -abbrev-commit df = difftool ui = true tool = kdiff3 path = C:/Program Files/KDiff3/kdiff3.exe trustExitCode = false guitool = kdiff3 path = C:/Program Files/KDiff3/kdiff3.exe trustExitCode = false conflictstyle = diff3 clean = git lfs clean %f smudge = git lfs smudge %f required = true Get Origin URL #need msys2 64bits installed tool = meld cmd = Meld.exe $LOCAL $REMOTE name = Sebastien Blanchard email = helper = store default = simple excludesfile = ~/.gitignore_global editor = gvim autocrlf = false safecrlf = false st = status -ignore-submodules=all stat = status -ignore-submodules=all ci = commit lg = log -color -graph -pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue) %Creset' -abbrev-commit df = difftool diffgvim = difftool -extcmd='gvim.exe -d' ui = true clean = git lfs clean %f smudge = git lfs smudge %f required = true tool = meld path = C:\Program Files (x86)\Meld\Meld.exe YOUR SETTINGS: only if you know the git config (some commands may break PW safety.) Copy git-prompt script to your home directory: Īdd below lines to your.

Git mergetool meld windows