forked from tomsquest/dotfiles
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added host specific config files in hosts subdirectory
started to use this mecanism for per machine git config
- Loading branch information
Cedric Gatay
committed
Jun 15, 2015
1 parent
47110fc
commit 91a22b4
Showing
4 changed files
with
38 additions
and
24 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[user] | ||
name = Cedric Gatay | ||
email = cedric.gatay.external@worldline.com |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
[user] | ||
email = cedric@gatay.fr | ||
name = Cedric Gatay | ||
|
||
|
||
[mergetool "diffmerge"] | ||
cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE | ||
trustExitCode = true | ||
[merge] | ||
tool = diffmerge | ||
[mergetool] | ||
keepBackup = false | ||
|
||
[difftool "sourcetree"] | ||
cmd = opendiff \"$LOCAL\" \"$REMOTE\" | ||
path = | ||
[mergetool "sourcetree"] | ||
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | ||
trustExitCode = true | ||
[credential] | ||
helper = osxkeychain | ||
|
||
[achievement] | ||
upload = true | ||
[filter "media"] | ||
clean = git-media-clean %f | ||
smudge = git-media-smudge %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