diff --git a/.bash_aliases b/.bash_aliases index be38a6c..4c66a81 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -243,8 +243,8 @@ function git_perso { # ║ ╦│ │ ╠═╣│││├┤ │││ ││ # ╚═╝┴ ┴ ╩ ╩┴ ┴└─┘┘└┘─┴┘ -alias amend_pro="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles GUIHENEUF \"' $1" -alias amend_perso="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles Guihéneuf \"' $1" +alias amend_pro="GIT_EDITOR=true git rebase --rebase-merges --exec 'git commit --amend --author=\"Robin-Charles GUIHENEUF \"' $1" +alias amend_perso="GIT_EDITOR=true git rebase --rebase-merges --exec 'git commit --amend --author=\"Robin-Charles Guihéneuf \"' $1" # ╦═╗┌─┐┌─┐┌─┐┌─┐┬┌┬┐┌─┐┬─┐┬┌─┐┌─┐ # ╠╦╝├┤ ├─┘│ │└─┐│ │ │ │├┬┘│├┤ └─┐ @@ -285,7 +285,7 @@ function ssh_keygen { # Flash sniffer nRF52 function nrf52 { - arm-none-eabi-objcopy -O ihex output/nrf52840/bin/$1 $1.hex + arm-none-eabi-objcopy -O ihex build/bin/$1 $1.hex nrfutil pkg generate --hw-version 52 --sd-req=0x00 --application $1.hex --application-version 1 $1.zip if [ -z "$2" ]