Skip to content

Commit

Permalink
Fix merge script
Browse files Browse the repository at this point in the history
  • Loading branch information
georgewitteman committed Aug 27, 2024
1 parent 38cbfac commit 4874cdd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion home/exact_dot_scripts/executable_merge
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ if $continue_; then
echo-err "Not in an active merge" >&2
exit 1
fi
add
toplevel="$(git rev-parse --show-toplevel)"
git add "$toplevel"
if $no_verify; then
echo-run git commit --no-edit --no-verify
else
Expand Down

0 comments on commit 4874cdd

Please sign in to comment.