1 Commits

Author SHA1 Message Date
raccoon
0a0550fcce Added Avatar settings and package 2026-05-05 05:44:12 +05:00
4 changed files with 7 additions and 26 deletions

View File

@@ -5,14 +5,13 @@ SETLOCAL
CD "%~dp0" CD "%~dp0"
git rev-parse --is-inside-work-tree >NUL || GOTO die git rev-parse --is-inside-work-tree >NUL || GOTO die
ECHO. ECHO The following files were changed and will be reverted:
ECHO *** WARNING: The following files were changed and will be reverted:
git diff --name-only HEAD git diff --name-only HEAD
ECHO. ECHO.
CHOICE /M "Execute" CHOICE /M "Execute"
IF %ERRORLEVEL% NEQ 1 ( IF %ERRORLEVEL% NEQ 1 (
ECHO Aborting discard... ECHO Aborting restore...
) ELSE ( ) ELSE (
git restore "%~dp0." || GOTO die git restore "%~dp0." || GOTO die
ECHO Done. ECHO Done.

View File

@@ -5,13 +5,12 @@ repository="$(dirname "$(readlink -f "$0")")/."
cd "${repository}" cd "${repository}"
git rev-parse --is-inside-work-tree >/dev/null git rev-parse --is-inside-work-tree >/dev/null
echo "" echo "The following files were changed and will be reverted:"
echo "*** WARNING: The following files were changed and will be reverted:"
git diff --name-only HEAD git diff --name-only HEAD
printf "\nExecute [Y,N]?"; read -r yn printf "\nExecute [Y,N]?"; read -r yn
if [ "$yn" = "${yn#[Yy]}" ]; then if [ "$yn" = "${yn#[Yy]}" ]; then
echo "Aborting discard..." echo "Aborting restore..."
else else
git restore "${repository}" git restore "${repository}"
echo "Done." echo "Done."

View File

@@ -11,24 +11,15 @@ IF NOT DEFINED upstream (
GOTO die GOTO die
) )
git fetch --all || GOTO die
ECHO.
ECHO Going to reset current branch to: %upstream% ECHO Going to reset current branch to: %upstream%
ECHO *** WARNING: All local changes and commits will be lost!
ECHO.
ECHO *** WARNING: These local commits will be lost:
git log "%upstream%..HEAD" --oneline
ECHO.
ECHO *** WARNING: These local files will be reset:
git diff "HEAD..%upstream%" --name-only
ECHO. ECHO.
CHOICE /M "Execute" CHOICE /M "Execute"
IF %ERRORLEVEL% NEQ 1 ( IF %ERRORLEVEL% NEQ 1 (
ECHO Aborting reset... ECHO Aborting reset...
) ELSE ( ) ELSE (
git fetch --all || GOTO die
git reset --hard "%upstream%" || GOTO die git reset --hard "%upstream%" || GOTO die
ECHO Done. ECHO Done.
) )

View File

@@ -9,16 +9,8 @@ if [ -z "$upstream" ]; then
exit 1 exit 1
fi fi
echo ""
echo "Going to reset current branch to: ${upstream}" echo "Going to reset current branch to: ${upstream}"
echo "*** WARNING: All local changes and commits will be lost!"
echo ""
echo "*** WARNING: These local commits will be lost:"
git log "${upstream}..HEAD" --oneline
echo ""
echo "*** WARNING: These local files will be reset:"
git diff "HEAD..${upstream}" --name-only
printf "\nExecute [Y,N]?"; read -r yn printf "\nExecute [Y,N]?"; read -r yn
if [ "$yn" = "${yn#[Yy]}" ]; then if [ "$yn" = "${yn#[Yy]}" ]; then