Skip to content

Commit

Permalink
Update gitconfig for samxl config
Browse files Browse the repository at this point in the history
  • Loading branch information
erichlf committed Jul 10, 2024
1 parent a487901 commit 4cb8988
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions home/dot-gitconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[user]
name = Erich L Foster
email = [email protected]
# signingkey = 08A7E764EC1713A9
# signingkey = 08A7E764EC1713A9
[core]
editor = nvim
autocrlf = input
Expand All @@ -28,7 +28,7 @@
untracked = cyan
[credential]
helper = /usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring
helper =
helper =
helper = /usr/local/bin/git-credential-manager
credentialStore = secretservice
[merge]
Expand Down Expand Up @@ -57,9 +57,11 @@
prompt = false
[difftool "meld"]
cmd = meld -n "$LOCAL" "$REMOTE"
[includeIf "gitdir:~/ros_ws/src/**"]
[includeIf "gitdir:~/workspace/*/src/**"]
path = ~/workspace/.samxl-gitconfig
[includeIf "gitdir:~/ros_ws/src/**"]
path = ~/ros_ws/.samxl-gitconfig
[includeIf "gitdir:/workspaces/src/**"]
[includeIf "gitdir:/workspaces/src/**"]
path = /workspaces/.samxl-gitconfig
[alias]
diffall = difftool -d
Expand Down

0 comments on commit 4cb8988

Please sign in to comment.