diff --git a/ush/prune_4nco_global.sh b/ush/prune_4nco_global.sh
index 793de51c70..61f5c4b863 100755
--- a/ush/prune_4nco_global.sh
+++ b/ush/prune_4nco_global.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # This script removes or restores directories and/or files found in 
 # the rlist below from the current working directory.   This script
@@ -15,6 +15,8 @@
 #             removed directories and files
 #    
 
+function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
+
 set -ex
 
 mode=$1
@@ -23,7 +25,14 @@ mode=$1
 if [[ "$mode" = "prune" ]]; then
     string="rm -r"
 elif [[ "$mode" = "restore" ]]; then
-    string="reset HEAD"
+    git_ver=$(git version | cut -d" " -f3)
+    if [ $(version $git_ver) -lt $(version "2.23.0") ]; then
+	use_checkout="YES"
+	string="checkout"
+    else
+	use_checkout="NO"
+	string="restore"
+    fi
 else
     echo " "
     echo "***ERROR*** invalid mode= $mode"
@@ -46,19 +55,27 @@ echo " "
 cd $topdir
 rlist="regression src/GSD unit-tests"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
+	fi
+    elif [[ "$mode" = "restore" ]]; then
+	if [[ "$use_checkout" = "YES" ]]; then
+	    git reset HEAD ${type}*
+            git checkout ${type}*
+	    rc=$?
+	else
+	    git restore --staged ${type}*
+	    git restore ${type}*
+	    rc=$?
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-	git checkout ${type}*
-	rc=$?
 	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
 	fi
     fi
@@ -69,19 +86,27 @@ done
 cd $topdir/doc
 rlist="EnKF_user_guide GSI_user_guide README.discover Release_Notes.fv3gfs_da.v15.0.0.txt Release_Notes.gfsda.v16.0.0.txt"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}*
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi
@@ -92,19 +117,27 @@ done
 cd $topdir/jobs
 rlist="JGDAS_EFSOI"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}*
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi
@@ -113,21 +146,29 @@ done
 
 # Process scripts directories and files
 cd $topdir/scripts
-rlist="exurma2p5_gsianl.sh exgdas_efsoi"
+rlist="exurma2p5_gsianl.sh exgdas_efsoi.sh exgdas_efsoi_update.sh"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}*
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi
@@ -136,21 +177,29 @@ done
 
 # Process ush directories and files
 cd $topdir/ush
-rlist="Get_Initial_Files comenkf comgsi gfs_truncate_enkf llsub para refactor_4nco_global run_arw rungsi sub"
+rlist="Get_Initial_Files comenkf_namelist_gfs.sh comenkf_namelist.sh comenkf_run_gfs.ksh comenkf_run_regional.ksh comgsi_namelist_chem.sh comgsi_namelist_gfs.sh comgsi_namelist.sh comgsi_run_chem.ksh comgsi_run_gfs.ksh comgsi_run_regional.ksh gfs_truncate_enkf.sh llsub_gsi_cmaq.sh para_config.gdas_analysis_high para_config.gfs_analysis refactor_4nco_global.sh run_arw_netcdf_hybens_testcase.sh rungsi62_prod.sh rungsi_globalprod.sh rungsi_nems_nmmb.sh rungsi_nmm_binary.sh rungsi_nmmprod.sh sub_discover sub_hera sub_jet sub_ncar sub_wcoss sub_wcoss_c sub_wcoss_d test_gdas_analysis_high.sh test_gfs_analysis.sh"
 for type in $rlist; do
-    if [ -e $type ] ; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}*
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi
@@ -159,21 +208,29 @@ done
 
 # Process util directories and files
 cd $topdir/util
-rlist="Aero Analysis_Utilities Baseline Config Conventional_Monitor Correlated_Obs DTC EFSOI Fit2Obs_Scorecard FOV GEN_BE_V2.0 GMI_BUFR MODIS_AOD Minimization_Monitor/data_xtrct Minimization_Monitor/image_gen Minimization_Monitor/nwprod/nam_minmon Misc NCEP NMC_Bkerror Ozone_Monitor/image_gen README Radar_Monitor Radiance_bias_correction_Utilities Radiance_Monitor/nwprod/nam_radmon Radiance_Utilities Single_Observation bufr_tools global_angupdate gsienvreport.sh python_utilities radar_process zero_biascoeff"
+rlist="AeroDA Analysis_Utilities Baseline Config Conventional_Monitor Correlated_Obs DTC EFSOI_Utilities Fit2Obs_Scorecard FOV_utilities GEN_BE_V2.0 GMI_BUFR_gen MODIS_AOD Minimization_Monitor/data_xtrct Minimization_Monitor/image_gen Minimization_Monitor/nwprod/gdas/driver Minimization_Monitor/nwprod/gfs/driver Minimization_Monitor/nwprod/nam_minmon Misc NCEP_bkerror NCEPgsi_Coupler NMC_Bkerror Ozone_Monitor/image_gen Ozone_Monitor/nwprod/gdas_oznmon/driver README Radar_Monitor Radiance_bias_correction_Utilities Radiance_Monitor/nwprod/gdas_radmon/driver Radiance_Monitor/nwprod/nam_radmon Radiance_Utilities Single_Observation bufr_tools global_angupdate gsienvreport.sh python_utilities radar_process zero_biascoeff"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}*
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi
@@ -184,19 +241,27 @@ done
 cd $topdir/util/EnKF
 rlist="arw python_utilities"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then    
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}*
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi
@@ -205,21 +270,29 @@ done
 
 # Process util/EnKF/gfs/src directories and files
 cd $topdir/util/EnKF/gfs/src
-rlist="adjustps misc preproc gribmean recenterncio_hybgain recenternemsiop_hybgain getnstensmeanp adderrspec getsfcnstensupdp"
+rlist="adjustps.fd misc preproc gribmean.fd recenterncio_hybgain.fd recenternemsiop_hybgain.fd getnstensmeanp.fd adderrspec.fd getsfcnstensupdp.fd"
 for type in $rlist; do
-    if [ -e $type ]; then
-	git $string ${type}*
-	rc=$?
-	if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git $string ${type}"
-            exit
+    if [[ "$mode" = "prune" ]]; then
+	if [ -e $type ]; then
+	    git $string ${type}*
+	    rc=$?
+	    if [[ $rc -ne 0 ]]; then
+		echo "***ERROR*** git $string ${type}"
+		exit
+	    fi
 	fi
-    fi
-    if [[ "$mode" = "restore" ]]; then
-        git checkout ${type}*
-        rc=$?
+    elif [[ "$mode" = "restore" ]]; then
+        if [[ "$use_checkout" = "YES" ]]; then
+            git reset HEAD ${type}* 
+            git checkout ${type}*
+            rc=$?
+        else
+            git restore --staged ${type}*
+            git restore ${type}*
+            rc=$?
+        fi
         if [[ $rc -ne 0 ]]; then
-            echo "***ERROR* git checkout ${type}"
+            echo "***ERROR*** restore failed for ${type}"
             exit
         fi
     fi