Commit Graph

3 Commits

Author SHA1 Message Date
Federico Grandi
0d52df43e8 fix: re-stage files after pulling (#411)
* fix: re-stage files after pulling

This should fix an issue that prevented changes from being committed
when `git pull --rebase --autostash` used.

Issue #406

* chore: mark pre-commit hook as executable

* fix: detect conflicts after pull
2022-06-26 20:58:34 +02:00
Federico Grandi
701772d352 release: v7.1.0 2021-03-03 09:08:08 +01:00
Federico Grandi
02188ba521 chore(dev-deps): upgrade to husky v5 2021-02-15 20:51:08 +01:00