X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fenv;h=24d4bec64f06953695ea3bc0dfafb233d33f96d7;hb=2328d7055fbda1c82b34bb36824566b08b9797a5;hp=ebd2dac38eef66843bf16edba659bf7973433573;hpb=2759bfac85a8a30d9c41cae1f4016c0eaaf416b3;p=openwrt.git diff --git a/scripts/env b/scripts/env index ebd2dac38e..24d4bec64f 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