From 54f257dad1882ef25b71943a85ea83e61824bd45 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Fri, 13 Feb 2009 16:33:20 +0100
Subject: [OSN] I've got my own user name on osnp1260077 :)

---
 net:osn.sagem/host:osnp1260077/user:g178241        |  1 +
 .../host:osnp1260077/user:g178241/Environment.zsh  | 43 ----------------------
 .../host:osnp1260077/user:g178241/KeyBindings.zsh  |  1 -
 .../host:osnp1260077/user:hugues/Environment.zsh   | 43 ++++++++++++++++++++++
 .../host:osnp1260077/user:hugues/KeyBindings.zsh   |  1 +
 5 files changed, 45 insertions(+), 44 deletions(-)
 create mode 120000 net:osn.sagem/host:osnp1260077/user:g178241
 delete mode 100644 net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh
 delete mode 120000 net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh
 create mode 100644 net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh
 create mode 120000 net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh

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:g178241/Environment.zsh
deleted file mode 100644
index d94c0e8..0000000
--- a/net:osn.sagem/host:osnp1260077/user:g178241/Environment.zsh
+++ /dev/null
@@ -1,43 +0,0 @@
-#--------[ UserDir ]-------------------------------------------------
-[ "$LOGNAME" = "g178241" ] && HOME=~hugues
-
-#--------[ Hashes ]-------------------------------------------------
-hash -d work=~/Wr0k
-hash -d targets=/targets
-hash -d tools=~work/t00lz
-
-#--------[ Generic Config ]-----------------------------------------
-#eval $(~tools/sagem-script44/set-env.pl 2>/dev/null)
-source ~/.env
-
-#--------[ Specific Config ]----------------------------------------
-
-#STLinux 2.2
-#export STLINUXRELEASE=${STLINUXRELEASE:-2.2}
-#export ST40RELEASE=${ST403RELEASE:-3.1.1_patch1}
-#STLinux 2.3
-export STLINUXRELEASE=${STLINUXRELEASE:-2.3}
-export ST40RELEASE=${ST403RELEASE:-4.1.1}
-
-export STLINUXBASE=/opt/STM/STLinux-$STLINUXRELEASE
-export STLINUXROOT=$STLINUXBASE/devkit/sh4/
-
-#export FORGE=http://g178241@forge-urd44.osn.sagem/svn/
-export GET_KERNEL_METHOD=svn
-#export GET_KERNEL_METHOD=git
-
-export KERNEL_PATH_BASE=~work/Kernel/exports/
-export COMP=ARCH=sh\ CROSS_COMPILE=sh4-linux-
-export TARGET_PATH=~targets/target
-
-
-export THIRDPARTYLIBS=~work/3rdparty/lib
-
-export PATH=$PATH:$STLINUXROOT/bin
-export PATH=$PATH:$STLINUXBASE/host/bin
-export PATH=$PATH:/opt/STM/ST40R$ST40RELEASE/bin
-export PATH=~/local/bin:~/local/sbin:$PATH
-
-#--------[ Shared Folders ]-----------------------------------------
-hash -d K:=/media/osn01001/Projets_STB
-hash -d J:=/media/osn02001/Echanges
diff --git a/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh b/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh
deleted file mode 120000
index 19de494..0000000
--- a/net:osn.sagem/host:osnp1260077/user:g178241/KeyBindings.zsh
+++ /dev/null
@@ -1 +0,0 @@
-../../../net:sweethome/host:paranoid/user:hugues/KeyBindings.zsh
\ No newline at end of file
diff --git a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh
new file mode 100644
index 0000000..d94c0e8
--- /dev/null
+++ b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh
@@ -0,0 +1,43 @@
+#--------[ UserDir ]-------------------------------------------------
+[ "$LOGNAME" = "g178241" ] && HOME=~hugues
+
+#--------[ Hashes ]-------------------------------------------------
+hash -d work=~/Wr0k
+hash -d targets=/targets
+hash -d tools=~work/t00lz
+
+#--------[ Generic Config ]-----------------------------------------
+#eval $(~tools/sagem-script44/set-env.pl 2>/dev/null)
+source ~/.env
+
+#--------[ Specific Config ]----------------------------------------
+
+#STLinux 2.2
+#export STLINUXRELEASE=${STLINUXRELEASE:-2.2}
+#export ST40RELEASE=${ST403RELEASE:-3.1.1_patch1}
+#STLinux 2.3
+export STLINUXRELEASE=${STLINUXRELEASE:-2.3}
+export ST40RELEASE=${ST403RELEASE:-4.1.1}
+
+export STLINUXBASE=/opt/STM/STLinux-$STLINUXRELEASE
+export STLINUXROOT=$STLINUXBASE/devkit/sh4/
+
+#export FORGE=http://g178241@forge-urd44.osn.sagem/svn/
+export GET_KERNEL_METHOD=svn
+#export GET_KERNEL_METHOD=git
+
+export KERNEL_PATH_BASE=~work/Kernel/exports/
+export COMP=ARCH=sh\ CROSS_COMPILE=sh4-linux-
+export TARGET_PATH=~targets/target
+
+
+export THIRDPARTYLIBS=~work/3rdparty/lib
+
+export PATH=$PATH:$STLINUXROOT/bin
+export PATH=$PATH:$STLINUXBASE/host/bin
+export PATH=$PATH:/opt/STM/ST40R$ST40RELEASE/bin
+export PATH=~/local/bin:~/local/sbin:$PATH
+
+#--------[ Shared Folders ]-----------------------------------------
+hash -d K:=/media/osn01001/Projets_STB
+hash -d J:=/media/osn02001/Echanges
diff --git a/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh
new file mode 120000
index 0000000..19de494
--- /dev/null
+++ b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh
@@ -0,0 +1 @@
+../../../net:sweethome/host:paranoid/user:hugues/KeyBindings.zsh
\ No newline at end of file
-- 
cgit v1.2.3


From 50c6677fee4a70e5cfb2200755d5c359054d5b2d Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Tue, 17 Feb 2009 16:18:03 +0100
Subject: [FUNCS] rebase git for versions >= 1.5.?.?

---
 01_Functions.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/01_Functions.zsh b/01_Functions.zsh
index 842e4d6..f5f64e3 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-)"
-- 
cgit v1.2.3


From b8b74c4386808e9ee0ad37441569544fc93a11a0 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@sagem.com>
Date: Fri, 20 Feb 2009 14:21:42 +0100
Subject: [Colors] osn08002.eurodec update

---
 net:eurodec/host:osn08002/Colors.zsh      | 4 ++++
 net:eurodec/host:osn08002/Environment.zsh | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 net:eurodec/host:osn08002/Colors.zsh
 create mode 100644 net:eurodec/host:osn08002/Environment.zsh

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
+
-- 
cgit v1.2.3