summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohan Wassberg <jocar@sunet.se>2022-08-23 10:38:52 +0200
committerJohan Wassberg <jocar@sunet.se>2022-08-23 10:38:52 +0200
commit0e6fc2f80398334033ea1ad9117d75fb1cc320e7 (patch)
tree0c1f025fe3980a5bfeb25f8c50f46271bb9dfd01 /Makefile
parent4f35dd127297fe7fd3e14f9e6c6e55b1127cbb84 (diff)
Show diff in editor while writing message
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c6e9a20d..4ffab1af 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,7 @@ deeptest: test testMDUIreach
commit2: test2
@git diff --color || true
- @echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
+ @echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
@git status -u
@echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi
@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
@@ -331,7 +331,7 @@ commit2: test2
commit: tidy test
@git diff --color || true
- @echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
+ @echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
@git status -u
@echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi
@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac