diff options
| -rwxr-xr-x | local/bin/usbkey | 2 | ||||
| -rw-r--r-- | shellrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/local/bin/usbkey b/local/bin/usbkey index d72c52b..6d5115f 100755 --- a/local/bin/usbkey +++ b/local/bin/usbkey @@ -93,7 +93,7 @@ op_ssh_list() { for KEY in $(find "$MOUNT_PATH/ssh" -name '*.pub'); do local N="${KEY#$MOUNT_PATH/ssh/}" echo -n "${N%.pub}: " - sed -n 's/ssh-rsa .* \(.*\)/\1/p' "$KEY" + sed -n 's/ssh-rsa [^ ]* \(.*\)/\1/p' "$KEY" done } @@ -84,7 +84,7 @@ gitbmerge() { rm -r "$WT" git worktree prune fi - git merge "$1" && git push && git branch -d "$1" && git push origin :"$1" + git merge --ff-only "$1" && git push && git branch -d "$1" && git push origin :"$1" ) } |