Permalink
Browse files

apply gitconfig escaping to all languages

  • Loading branch information...
1 parent cb61089 commit 3560e184f2342c29b7baef23dc2b8828378a5f10 @jnavila jnavila committed May 13, 2013
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ nebo můžete upravit soubor `~/.gitconfig` a vložit následující řádky:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -342,7 +342,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ o puedes editar tu archivo '~/.gitconfig' para añadirle las siguientes lineas:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -218,7 +218,7 @@ ou vous pouvez éditer votre fichier `~/.gitconfig` pour y ajouter ces lignes :
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ in alternativa puoi modificate il file `~/.gitconfig` aggiungendo queste linee:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ diff のラッパーは、7 つの引数が渡されていることを確認し
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ Git config 파일에 이 스크립트를 모두 추가해야 한다. 설정해
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ of je kunt je `~/.gitconfig` bestand aanpassen en deze regels toevoegen:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -177,7 +177,7 @@ ou você pode editar o seu arquivo `~/.gitconfig` para adicionar estas linhas.:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ Git автоматически раскрасит большую часть св
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ or you can edit your `~/.gitconfig` file to add these lines:
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -179,7 +179,7 @@ diff 包裝腳本首先確定傳遞過來7個參數,隨後把其中2個傳遞
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff
@@ -178,7 +178,7 @@ diff包装脚本首先确定传递过来7个参数,随后把其中2个传递
[merge]
tool = extMerge
[mergetool "extMerge"]
- cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[diff]
external = extDiff

0 comments on commit 3560e18

Please sign in to comment.