File tree 6 files changed +315
-384
lines changed
6 files changed +315
-384
lines changed Original file line number Diff line number Diff line change 31
31
smudge = git media smudge %f
32
32
[push]
33
33
default = simple
34
+ followTags = true
34
35
[mergetool "kdiff3NoAuto"]
35
36
cmd = kdiff3 --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
36
37
[color]
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ aws_prompt_info() {
14
14
# Get the current ruby version in use with RVM:
15
15
RUBY_PROMPT_=" %{$fg_bold [green]%}\$ (chruby_prompt_info) "
16
16
# Get the host name (first 4 chars)
17
- HOST_PROMPT_=' %{$fg_bold[red]%}@chris $(aws_prompt_info) %{$fg_bold[cyan]%}%c '
17
+ HOST_PROMPT_=' %{$fg_bold[red]%}$(aws_prompt_info) %{$fg_bold[cyan]%}%d '
18
18
GIT_PROMPT=" %{$fg_bold [blue]%}\$ (git_prompt_info)%{$fg_bold [blue]%} % %{$reset_color %}"
19
19
PROMPT=" $HOST_PROMPT_$RUBY_PROMPT_$GIT_PROMPT
20
20
➜ "
You can’t perform that action at this time.
0 commit comments