X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fenv;h=63e26eb154da83b638b8c2dc766edbc8a6f98f3f;hb=0c8f72639ff018510974dc3c4059ad23a5c5c358;hp=80e08ec4abf57968cb2b74259fb5cbb0755c743b;hpb=a97304cf61f18ec35c4f9305970ed0014f83b6d4;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/scripts/env b/scripts/env
index 80e08ec4ab..63e26eb154 100755
--- a/scripts/env
+++ b/scripts/env
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 BASEDIR="$PWD"
 ENVDIR="$PWD/env"
+export GREP_OPTIONS=
 
 usage() {
 	cat <<EOF
@@ -14,7 +15,8 @@ Commands:
 	delete <name>     Delete an environment
 	rename <newname>  Rename the current environment
 	diff              Show differences between current state and environment
-	save              Save your changes to the environment
+	save [message]    Save your changes to the environment, optionally using
+	                  the given commit message
 	revert            Revert your changes since last save
 
 Options:
@@ -96,19 +98,19 @@ env_do_reset() {
 
 env_list() {
 	env_init
-	git branch | grep -vE '^. master$'
+	git branch --color | grep -vE '^. master$'
 }
 
 env_diff() {
 	env_init
 	env_sync_data
-	git diff --cached
+	git diff --cached --color
 	env_link_config
 }
 
 env_save() {
 	env_init
-	env_sync
+	env_sync "$@"
 	env_link_config
 }