From de22151f0eea63f46044db5dba5bc6fe0761ec7f Mon Sep 17 00:00:00 2001 From: Jannik Zander Date: Tue, 24 May 2016 18:20:02 +0200 Subject: [PATCH] Add git/attributes --- .config/git/attributes | 1 + .config/git/config | 3 ++- .config/profile/rc/prompt.sh | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .config/git/attributes diff --git a/.config/git/attributes b/.config/git/attributes new file mode 100644 index 0000000..5296e27 --- /dev/null +++ b/.config/git/attributes @@ -0,0 +1 @@ +* text=auto diff --git a/.config/git/config b/.config/git/config index a086a63..0c7514c 100644 --- a/.config/git/config +++ b/.config/git/config @@ -97,7 +97,8 @@ templatedir = ~/.config/git/templates [core] excludesfile = ~/.config/git/ignore + attributesFile = ~/.config/git/attributes editor = vim - autocrlf = false + #autocrlf = false [include] path = ~/.config/git/config_local diff --git a/.config/profile/rc/prompt.sh b/.config/profile/rc/prompt.sh index 9b30788..9aa7ed7 100644 --- a/.config/profile/rc/prompt.sh +++ b/.config/profile/rc/prompt.sh @@ -24,8 +24,8 @@ if [ -f "${HOME}/.config/profile/rc/git-prompt.sh" ]; then export GIT_PS1_SHOWSTASHSTATE='y' export GIT_PS1_SHOWUNTRACKEDFILES='y' export GIT_PS1_DESCRIBE_STYLE='contains' - export GIT_PS1_SHOWUPSTREAM="auto" - export GIT_PS1_STATESEPARATOR=" [" + export GIT_PS1_SHOWUPSTREAM='auto' + export GIT_PS1_STATESEPARATOR=' [' fi -- 2.43.0