Last active
March 4, 2023 20:08
-
-
Save carlosanders/b79dfb45423b214e56f6d24c6fe68f1f to your computer and use it in GitHub Desktop.
Configuração Winmerge no Git
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [user] | |
| name = Carlos Anders | |
| editor = 'C:/app/Microsoft VS Code/Code.exe' -w | |
| email = [email protected] | |
| [http] | |
| sslVerify = true | |
| [mergetool] | |
| prompt = false | |
| keepBackup = false | |
| keepTemporaries = false | |
| [merge] | |
| tool = winmerge | |
| guitool = winmerge | |
| [mergetool "winmerge"] | |
| name = WinMerge | |
| trustExitCode = true | |
| cmd = 'C:/Program Files/WinMerge/WinMergeU.exe' -u -e -fm -wl -dl Local -wr -dr Remote $LOCAL $MERGED $REMOTE | |
| path = 'C:/Program Files/WinMerge/WinMergeU.exe' | |
| [diff] | |
| tool = winmerge | |
| #guitool = tortoisediff | |
| [difftool "winmerge"] | |
| #name = WinMerge | |
| #trustExitCode = true | |
| #cmd = /c/Program\\ Files/WinMerge/WinMergeU.exe -u -e $LOCAL $REMOTE | |
| cmd = "'C:/Program Files/WinMerge/WinMergeU.exe'" -e "$LOCAL" "$REMOTE" | |
| #[difftool "tortoisediff"] | |
| # path = C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe | |
| # cmd = \"C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [color] | |
| ui = auto | |
| [color "branch"] | |
| current = yellow bold | |
| local = green bold | |
| remote = cyan bold | |
| [color "diff"] | |
| meta = yellow bold | |
| frag = magenta bold | |
| old = red bold | |
| new = green bold | |
| whitespace = red reverse | |
| [color "status"] | |
| added = green bold | |
| changed = yellow bold | |
| untracked = red bold | |
| [log] | |
| date = relative | |
| [format] | |
| # https://programming.vip/docs/minimum-output-of-git-log-with-author-and-date.html | |
| # https://stackoverflow.com/questions/1441010/the-shortest-possible-output-from-git-log-containing-author-and-date | |
| #pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset | |
| pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7)%ae%Cred%d %Creset%s | |
| #pretty = format:%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(7,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D | |
| [alias] | |
| a = add --all | |
| ai = add -i | |
| ap = apply | |
| as = apply --stat | |
| ac = apply --check | |
| ama = am --abort | |
| amr = am --resolved | |
| ams = am --skip | |
| b = branch | |
| ba = branch -a | |
| bd = branch -d | |
| br = branch -r | |
| bdd = branch -D | |
| c = commit | |
| ca = commit -a | |
| cm = commit -m | |
| cem = commit --allow-empty -m | |
| cam = commit -am | |
| cd = commit --amend | |
| cad = commit -a --amend | |
| ced = commit --allow-empty --amend | |
| cp = cherry-pick | |
| cpa = cherry-pick --abort | |
| cpc = cherry-pick --continue | |
| d = diff | |
| dc = diff --cached | |
| dl = difftool | |
| dlc = difftool --cached | |
| dk = diff --check | |
| dp = diff --patience | |
| dck = diff --cached --check | |
| f = fetch | |
| fo = fetch origin | |
| fu = fetch upstream | |
| fp = format-patch | |
| fk = fsck | |
| g = grep -p | |
| l = log --oneline | |
| lg = log --oneline --graph --decorate | |
| lgs = log --stat | |
| lgp = log --oneline --decorate --parents | |
| lgd = log --date=short --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G?%C(auto,blue)%>(12,trunc)%ad %C(auto,green)%ae %C(auto,reset)%s%C(auto,yellow)% gD% D' | |
| lgw = log --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(15,trunc)%aN%C(auto,reset)%s%C(auto,magenta)% gD (%D)' | |
| lw = log --date=short | |
| ls = ls-files | |
| lsf = !git ls-files | grep -i | |
| m = mergeq | |
| ma = merge --abort | |
| mc = merge --continue | |
| ms = merge --skip | |
| o = checkout | |
| ob = checkout -b | |
| pr = prune -v | |
| ps = push | |
| psf = push -f | |
| psu = push -u | |
| pso = push origin | |
| psao = push --all origin | |
| psfo = push -f origin | |
| psuo = push -u origin | |
| psom = push origin master | |
| psfom = push -f origin master | |
| psuom = push -u origin master | |
| pl = pull | |
| plu = pull -u | |
| plo = pull origin | |
| plp = pull upstream | |
| plom = pull origin master | |
| plpm = pull upstream master | |
| pb = pull --rebase | |
| pbo = pull --rebase origin | |
| pbp = pull --rebase upstream | |
| pbom = pull --rebase origin master | |
| pbpm = pull --rebase upstream master | |
| rb = rebase | |
| rba = rebase --abort | |
| rbc = rebase --continue | |
| rbi = rebase --interactive | |
| rbs = rebase --skip | |
| re = reset | |
| rh = reset HEAD | |
| reh = reset --hard | |
| rem = reset --mixed | |
| res = reset --soft | |
| rehh = reset --hard HEAD | |
| remh = reset --mixed HEAD | |
| resh = reset --soft HEAD | |
| r = remote | |
| ra = remote add | |
| rr = remote rm | |
| rv = remote -v | |
| rm = remote rename | |
| rp = remote prune | |
| rs = remote show | |
| rao = remote add origin | |
| rau = remote add upstream | |
| rso = remote show origin | |
| rsu = remote show upstream | |
| rpo = remote prune origin | |
| rpu = remote prune upstream | |
| s = status | |
| sb = status -s -b | |
| sa = stash apply | |
| sc = stash clear | |
| sd = stash drop | |
| sl = stash list | |
| sp = stash pop | |
| ss = stash save | |
| sw = stash show | |
| w = show | |
| wp = show -p | |
| wr = show -p --no-color | |
| svnr = svn rebase | |
| svnd = svn dcommit | |
| svnl = svn log --oneline --show-commit | |
| #https://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-locally-and-remotely | |
| rmbranch = "!f(){ git branch -d ${1} && git push origin --delete ${1}; };f" | |
| kill = "!f(){ git branch -D \"$1\"; git push origin --delete \"$1\"; };f" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [user] | |
| name = Carlos Anders | |
| editor = 'C:/app/Microsoft VS Code/Code.exe' -w | |
| email = [email protected] | |
| [http] | |
| sslVerify = true | |
| [mergetool] | |
| prompt = false | |
| keepBackup = false | |
| keepTemporaries = false | |
| [merge] | |
| tool = winmerge | |
| guitool = winmerge | |
| [mergetool "winmerge"] | |
| name = WinMerge | |
| trustExitCode = true | |
| cmd = 'C:/Program Files/WinMerge/WinMergeU.exe' -u -e -fm -wl -dl Local -wr -dr Remote $LOCAL $MERGED $REMOTE | |
| path = 'C:/Program Files/WinMerge/WinMergeU.exe' | |
| [diff] | |
| tool = winmerge | |
| #guitool = tortoisediff | |
| [difftool "winmerge"] | |
| #name = WinMerge | |
| #trustExitCode = true | |
| #cmd = /c/Program\\ Files/WinMerge/WinMergeU.exe -u -e $LOCAL $REMOTE | |
| cmd = "'C:/Program Files/WinMerge/WinMergeU.exe'" -e "$LOCAL" "$REMOTE" | |
| #[difftool "tortoisediff"] | |
| # path = C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe | |
| # cmd = \"C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [color] | |
| ui = auto | |
| [color "branch"] | |
| current = yellow bold | |
| local = green bold | |
| remote = cyan bold | |
| [color "diff"] | |
| meta = yellow bold | |
| frag = magenta bold | |
| old = red bold | |
| new = green bold | |
| whitespace = red reverse | |
| [color "status"] | |
| added = green bold | |
| changed = yellow bold | |
| untracked = red bold | |
| [log] | |
| date = relative | |
| [format] | |
| # https://programming.vip/docs/minimum-output-of-git-log-with-author-and-date.html | |
| # https://stackoverflow.com/questions/1441010/the-shortest-possible-output-from-git-log-containing-author-and-date | |
| #pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset | |
| pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7)%ae%Cred%d %Creset%s | |
| #pretty = format:%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(7,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D | |
| [alias] | |
| a = add --all | |
| ai = add -i | |
| ap = apply | |
| as = apply --stat | |
| ac = apply --check | |
| ama = am --abort | |
| amr = am --resolved | |
| ams = am --skip | |
| b = branch | |
| ba = branch -a | |
| bd = branch -d | |
| br = branch -r | |
| bdd = branch -D | |
| c = commit | |
| ca = commit -a | |
| cm = commit -m | |
| cem = commit --allow-empty -m | |
| cam = commit -am | |
| cd = commit --amend | |
| cad = commit -a --amend | |
| ced = commit --allow-empty --amend | |
| cp = cherry-pick | |
| cpa = cherry-pick --abort | |
| cpc = cherry-pick --continue | |
| d = diff | |
| dc = diff --cached | |
| dl = difftool | |
| dlc = difftool --cached | |
| dk = diff --check | |
| dp = diff --patience | |
| dck = diff --cached --check | |
| f = fetch | |
| fo = fetch origin | |
| fu = fetch upstream | |
| fp = format-patch | |
| fk = fsck | |
| g = grep -p | |
| l = log --oneline | |
| lg = log --oneline --graph --decorate | |
| lgs = log --stat | |
| lgp = log --oneline --decorate --parents | |
| lgd = log --date=short --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G?%C(auto,blue)%>(12,trunc)%ad %C(auto,green)%ae %C(auto,reset)%s%C(auto,yellow)% gD% D' | |
| lgw = log --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(15,trunc)%aN%C(auto,reset)%s%C(auto,magenta)% gD (%D)' | |
| lw = log --date=short | |
| ls = ls-files | |
| lsf = !git ls-files | grep -i | |
| m = mergeq | |
| ma = merge --abort | |
| mc = merge --continue | |
| ms = merge --skip | |
| o = checkout | |
| ob = checkout -b | |
| pr = prune -v | |
| ps = push | |
| psf = push -f | |
| psu = push -u | |
| pso = push origin | |
| psao = push --all origin | |
| psfo = push -f origin | |
| psuo = push -u origin | |
| psom = push origin master | |
| psfom = push -f origin master | |
| psuom = push -u origin master | |
| pl = pull | |
| plu = pull -u | |
| plo = pull origin | |
| plp = pull upstream | |
| plom = pull origin master | |
| plpm = pull upstream master | |
| pb = pull --rebase | |
| pbo = pull --rebase origin | |
| pbp = pull --rebase upstream | |
| pbom = pull --rebase origin master | |
| pbpm = pull --rebase upstream master | |
| rb = rebase | |
| rba = rebase --abort | |
| rbc = rebase --continue | |
| rbi = rebase --interactive | |
| rbs = rebase --skip | |
| re = reset | |
| rh = reset HEAD | |
| reh = reset --hard | |
| rem = reset --mixed | |
| res = reset --soft | |
| rehh = reset --hard HEAD | |
| remh = reset --mixed HEAD | |
| resh = reset --soft HEAD | |
| r = remote | |
| ra = remote add | |
| rr = remote rm | |
| rv = remote -v | |
| rm = remote rename | |
| rp = remote prune | |
| rs = remote show | |
| rao = remote add origin | |
| rau = remote add upstream | |
| rso = remote show origin | |
| rsu = remote show upstream | |
| rpo = remote prune origin | |
| rpu = remote prune upstream | |
| s = status | |
| sb = status -s -b | |
| sa = stash apply | |
| sc = stash clear | |
| sd = stash drop | |
| sl = stash list | |
| sp = stash pop | |
| ss = stash save | |
| sw = stash show | |
| w = show | |
| wp = show -p | |
| wr = show -p --no-color | |
| svnr = svn rebase | |
| svnd = svn dcommit | |
| svnl = svn log --oneline --show-commit | |
| #https://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-locally-and-remotely | |
| rmbranch = "!f(){ git branch -d ${1} && git push origin --delete ${1}; };f" | |
| kill = "!f(){ git branch -D \"$1\"; git push origin --delete \"$1\"; };f" | |
| [core] | |
| editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor | |
| [pull] | |
| rebase = false | |
| [fetch] | |
| prune = false | |
| [rebase] | |
| autoStash = false | |
| [i18n] | |
| filesEncoding = utf-8 | |
| [filter "lfs"] | |
| clean = git-lfs clean -- %f | |
| smudge = git-lfs smudge -- %f | |
| process = git-lfs filter-process | |
| required = true | |
| [filesystem "Oracle Corporation|1.8.0_301|616039440"] | |
| timestampResolution = 1001 microseconds | |
| minRacyThreshold = 0 nanoseconds | |
| [filesystem "Oracle Corporation|1.8.0_301|1042701199"] | |
| timestampResolution = 1001 microseconds | |
| minRacyThreshold = 0 nanoseconds | |
| [safe] | |
| directory = D:/projetos/data_science/2022/projeto-nadex-nder | |
| directory = D:/projetos/java/fontes/2021/workspace-spring-tool-suite-4/web_services/siscatbr-client |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Links: | |
| # https://blog.umbler.com/br/comandos-do-git-para-desenvolvedores/ | |
| # https://gist.github.com/shawndumas/6158524 | |
| # https://pt.switch-case.com/53949836 | |
| [mergetool] | |
| prompt = false | |
| keepBackup = false | |
| keepTemporaries = false | |
| [merge] | |
| tool = winmerge | |
| [mergetool "winmerge"] | |
| name = WinMerge | |
| trustExitCode = true | |
| cmd = \"C:\\desenv\\WinMerge\\WinMergeU.exe\" -e -u -dl \"Base\" -dr \"Mine\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" | |
| [diff] | |
| tool = winmerge | |
| [difftool "winmerge"] | |
| name = WinMerge | |
| trustExitCode = true | |
| cmd = \"C:\\desenv\\WinMerge\\WinMergeU.exe\" -u -e $LOCAL $REMOTE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [user] | |
| name = Carlos Anders | |
| editor = 'C:/app/Microsoft VS Code/Code.exe' -w | |
| email = [email protected] | |
| [http] | |
| sslVerify = true | |
| [mergetool] | |
| prompt = false | |
| keepBackup = false | |
| keepTemporaries = false | |
| [merge] | |
| tool = winmerge | |
| guitool = winmerge | |
| [mergetool "winmerge"] | |
| name = WinMerge | |
| trustExitCode = true | |
| cmd = /c/Program/ Files/WinMerge/WinMergeU.exe -u -e -fm -wl -dl Local -wr -dr Remote $LOCAL $MERGED $REMOTE | |
| path = C:/Program Files/WinMerge/winmergeu.exe | |
| [diff] | |
| tool = winmerge | |
| guitool = tortoisediff | |
| [difftool "winmerge"] | |
| name = WinMerge | |
| trustExitCode = true | |
| cmd = /c/Program\\ Files/WinMerge/WinMergeU.exe -u -e $LOCAL $REMOTE | |
| #[difftool "tortoisediff"] | |
| # path = C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe | |
| # cmd = \"C:/Program Files/TortoiseGit/bin/TortoiseGitMerge.exe\" \"$LOCAL\" \"$REMOTE\" | |
| [color] | |
| ui = auto | |
| [color "branch"] | |
| current = yellow bold | |
| local = green bold | |
| remote = cyan bold | |
| [color "diff"] | |
| meta = yellow bold | |
| frag = magenta bold | |
| old = red bold | |
| new = green bold | |
| whitespace = red reverse | |
| [color "status"] | |
| added = green bold | |
| changed = yellow bold | |
| untracked = red bold | |
| [log] | |
| date = relative | |
| [format] | |
| # https://programming.vip/docs/minimum-output-of-git-log-with-author-and-date.html | |
| # https://stackoverflow.com/questions/1441010/the-shortest-possible-output-from-git-log-containing-author-and-date | |
| #pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset | |
| pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7)%ae%Cred%d %Creset%s | |
| #pretty = format:%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(7,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D | |
| [alias] | |
| a = add --all | |
| ai = add -i | |
| ap = apply | |
| as = apply --stat | |
| ac = apply --check | |
| ama = am --abort | |
| amr = am --resolved | |
| ams = am --skip | |
| b = branch | |
| ba = branch -a | |
| bd = branch -d | |
| br = branch -r | |
| bdd = branch -D | |
| c = commit | |
| ca = commit -a | |
| cm = commit -m | |
| cem = commit --allow-empty -m | |
| cam = commit -am | |
| cd = commit --amend | |
| cad = commit -a --amend | |
| ced = commit --allow-empty --amend | |
| cp = cherry-pick | |
| cpa = cherry-pick --abort | |
| cpc = cherry-pick --continue | |
| d = diff | |
| dc = diff --cached | |
| dl = difftool | |
| dlc = difftool --cached | |
| dk = diff --check | |
| dp = diff --patience | |
| dck = diff --cached --check | |
| f = fetch | |
| fo = fetch origin | |
| fu = fetch upstream | |
| fp = format-patch | |
| fk = fsck | |
| g = grep -p | |
| l = log --oneline | |
| lg = log --oneline --graph --decorate | |
| lgs = log --stat | |
| lgp = log --oneline --decorate --parents | |
| lgd = log --date=short --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G?%C(auto,blue)%>(12,trunc)%ad %C(auto,green)%ae %C(auto,reset)%s%C(auto,yellow)% gD% D' | |
| lgw = log --pretty=format:'%C(auto,yellow)%h%C(auto,magenta)% G? %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(15,trunc)%aN%C(auto,reset)%s%C(auto,magenta)% gD (%D)' | |
| lw = log --date=short | |
| ls = ls-files | |
| lsf = !git ls-files | grep -i | |
| m = mergeq | |
| ma = merge --abort | |
| mc = merge --continue | |
| ms = merge --skip | |
| o = checkout | |
| ob = checkout -b | |
| pr = prune -v | |
| ps = push | |
| psf = push -f | |
| psu = push -u | |
| pso = push origin | |
| psao = push --all origin | |
| psfo = push -f origin | |
| psuo = push -u origin | |
| psom = push origin master | |
| psfom = push -f origin master | |
| psuom = push -u origin master | |
| pl = pull | |
| plu = pull -u | |
| plo = pull origin | |
| plp = pull upstream | |
| plom = pull origin master | |
| plpm = pull upstream master | |
| pb = pull --rebase | |
| pbo = pull --rebase origin | |
| pbp = pull --rebase upstream | |
| pbom = pull --rebase origin master | |
| pbpm = pull --rebase upstream master | |
| rb = rebase | |
| rba = rebase --abort | |
| rbc = rebase --continue | |
| rbi = rebase --interactive | |
| rbs = rebase --skip | |
| re = reset | |
| rh = reset HEAD | |
| reh = reset --hard | |
| rem = reset --mixed | |
| res = reset --soft | |
| rehh = reset --hard HEAD | |
| remh = reset --mixed HEAD | |
| resh = reset --soft HEAD | |
| r = remote | |
| ra = remote add | |
| rr = remote rm | |
| rv = remote -v | |
| rm = remote rename | |
| rp = remote prune | |
| rs = remote show | |
| rao = remote add origin | |
| rau = remote add upstream | |
| rso = remote show origin | |
| rsu = remote show upstream | |
| rpo = remote prune origin | |
| rpu = remote prune upstream | |
| s = status | |
| sb = status -s -b | |
| sa = stash apply | |
| sc = stash clear | |
| sd = stash drop | |
| sl = stash list | |
| sp = stash pop | |
| ss = stash save | |
| sw = stash show | |
| w = show | |
| wp = show -p | |
| wr = show -p --no-color | |
| svnr = svn rebase | |
| svnd = svn dcommit | |
| svnl = svn log --oneline --show-commit | |
| #https://stackoverflow.com/questions/2003505/how-do-i-delete-a-git-branch-locally-and-remotely | |
| rmbranch = "!f(){ git branch -d ${1} && git push origin --delete ${1}; };f" | |
| kill = "!f(){ git branch -D \"$1\"; git push origin --delete \"$1\"; };f" | |
| [core] | |
| editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor | |
| [pull] | |
| rebase = false | |
| [fetch] | |
| prune = false | |
| [rebase] | |
| autoStash = false | |
| [i18n] | |
| filesEncoding = utf-8 | |
| [filter "lfs"] | |
| clean = git-lfs clean -- %f | |
| smudge = git-lfs smudge -- %f | |
| process = git-lfs filter-process | |
| required = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment