X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2759bfac85a8a30d9c41cae1f4016c0eaaf416b3..2685b0601715829f499608a3a2c6f2a79713fbc2:/scripts/env diff --git a/scripts/env b/scripts/env index ebd2dac38..24d4bec64 100755 --- a/scripts/env +++ b/scripts/env @@ -96,13 +96,13 @@ 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 } @@ -192,7 +192,7 @@ env_new() { fi git checkout -b "$1" "$from" if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then - if ask_bool 1 "Do you want to keep your current config and files?"; then + if ask_bool 1 "Do you want to start your configuration repository with the current configuration?"; then [ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && { mkdir -p "$ENVDIR/files" shopt -s dotglob