fix: re-stage files after pulling (#411)

Browse Source

* 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

...

This commit is contained in:

Federico Grandi

2022-06-26 20:58:34 +02:00

committed by GitHub

parent 9fc8e267d9

commit 0d52df43e8

3 changed files with 20 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

lib/index.js generated

File diff suppressed because one or more lines are too long