diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-20 15:29:18 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-02-20 15:29:18 +0100 |
| commit | 545fa99fe715ae62b49bb75492cdae187ac7d2f4 (patch) | |
| tree | fdc217dcb161ec50fd876ebc04ab104d8f5fb80f | |
| parent | d2d3735f131c9d8cd9611e3a44d4da191e8d6293 (diff) | |
| parent | b8b74c4386808e9ee0ad37441569544fc93a11a0 (diff) | |
Merge branch 'master' of /work/repos/zdotdir
Conflicts:
net:osn.sagem/host:osnp1260077/user:g178241
| -rw-r--r-- | 01_Functions.zsh | 1 | ||||
| -rw-r--r-- | net:eurodec/host:osn08002/Colors.zsh | 4 | ||||
| -rw-r--r-- | net:eurodec/host:osn08002/Environment.zsh | 3 | ||||
| l--------- | net:osn.sagem/host:osnp1260077/user:g178241 | 1 | ||||
| -rw-r--r-- | net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh (renamed from net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh) | 0 | ||||
| l--------- | net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh (renamed from net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh) | 0 |
6 files changed, 9 insertions, 0 deletions
diff --git a/01_Functions.zsh b/01_Functions.zsh index f341200..f40a7df 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -81,6 +81,7 @@ get_git_branch () # Rebase in progress ? REBASE=""; [ -e $(git-rev-parse --git-dir)/../.dotest/rebasing ] && REBASE="rebase:" + [ -d $(git-rev-parse --git-dir)/rebase-merge ] && REBASE="rebase:" # Get current working GIT branch my_git_branch="$REBASE$(git-branch 2>&- | grep -E '^\* ' | cut -c3-)" diff --git a/net:eurodec/host:osn08002/Colors.zsh b/net:eurodec/host:osn08002/Colors.zsh new file mode 100644 index 0000000..a43eaef --- /dev/null +++ b/net:eurodec/host:osn08002/Colors.zsh @@ -0,0 +1,4 @@ + +PS1_USER=$color[white] +PS1_USER_SSH=$PS1_USER + diff --git a/net:eurodec/host:osn08002/Environment.zsh b/net:eurodec/host:osn08002/Environment.zsh new file mode 100644 index 0000000..35b1dde --- /dev/null +++ b/net:eurodec/host:osn08002/Environment.zsh @@ -0,0 +1,3 @@ + +[ "$TERM" = "rxvt-unicode" ] && export TERM=rxvt-color + diff --git a/net:osn.sagem/host:osnp1260077/user:g178241 b/net:osn.sagem/host:osnp1260077/user:g178241 new file mode 120000 index 0000000..5f7df0c --- /dev/null +++ b/net:osn.sagem/host:osnp1260077/user:g178241 @@ -0,0 +1 @@ +user:hugues/
\ No newline at end of file diff --git a/net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh index d94c0e8..d94c0e8 100644 --- a/net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh +++ b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh diff --git a/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh index 19de494..19de494 120000 --- a/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh +++ b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh |