terminal-life: use the user name instead of fullname for git
This commit is contained in:
parent
fc64336279
commit
a3c77b42fb
|
@ -12,8 +12,8 @@ in '' [user]
|
|||
else ""
|
||||
}
|
||||
${
|
||||
if user.fullName != null
|
||||
then "name = ${user.fullName}"
|
||||
if user.name != null
|
||||
then "name = ${user.name}"
|
||||
else ""
|
||||
}
|
||||
${
|
||||
|
@ -27,7 +27,19 @@ in '' [user]
|
|||
[alias]
|
||||
pol = pull
|
||||
ack = -c color.grep.linenumber=\"bold yellow\"\n -c color.grep.filename=\"bold green\"\n -c color.grep.match=\"reverse yellow\"\n grep --break --heading --line-number
|
||||
# define command which will be used when "nvim"is set as a merge tool
|
||||
lg = "!f() { \
|
||||
git log --all --color --graph --pretty=format:'%C(bold yellow)<sig>%G?</sig>%C(reset) %C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(blue)<%an>%C(reset)' | \
|
||||
sed \
|
||||
-e 's#<sig>G</sig>#Good#' \
|
||||
-e 's#<sig>B</sig>#\\nBAD \\nBAD \\nBAD \\nBAD \\nBAD#' \
|
||||
-e 's#<sig>U</sig>#Unknown#' \
|
||||
-e 's#<sig>X</sig>#Expired#' \
|
||||
-e 's#<sig>Y</sig>#Expired Key#' \
|
||||
-e 's#<sig>R</sig>#Revoked#' \
|
||||
-e 's#<sig>E</sig>#Missing Key#' \
|
||||
-e 's#<sig>N</sig>#None#' | \
|
||||
less -r; \
|
||||
}; f"
|
||||
|
||||
[mergetool]
|
||||
prompt = false
|
||||
|
|
Loading…
Reference in a new issue