Compare commits

...

No commits in common. "1912118e981a72e20e9f823e24ac4e7dac18ce06" and "dd5b84ac13526650c45f6c0c23e40e9bf9ace060" have entirely different histories.

3 changed files with 5 additions and 8 deletions

View File

@ -114,10 +114,6 @@ function grbm {
git rebase -i master git rebase -i master
} }
function grbr {
git rebase --interactive --autosquash --root
}
function gam { function gam {
git autofixup master git autofixup master
git rebase --interactive --autosquash master git rebase --interactive --autosquash master
@ -128,13 +124,14 @@ function ga {
git rebase --interactive --autosquash HEAD~$1 git rebase --interactive --autosquash HEAD~$1
} }
# Git amend
alias amend_pro="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles GUIHENEUF <rguiheneuf@netatmo.com>\"' $1"
alias amend_perso="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles Guihéneuf <robin-charles@hotmail.fr>\"' $1"
function grbr { function grbr {
git rebase --interactive --autosquash --root git rebase --interactive --autosquash --root
} }
# Git amend
alias amend_pro="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles GUIHENEUF <rguiheneuf@netatmo.com>\"' $1"
alias amend_perso="GIT_EDITOR=true git rebase --preserve-merges --exec 'git commit --amend --author=\"Robin-Charles Guihéneuf <robin-charles@hotmail.fr>\"' $1"
# Repositories # Repositories
alias bc='cd $HOME/Netatmo/embedded/firmware-bitcloud' alias bc='cd $HOME/Netatmo/embedded/firmware-bitcloud'
alias fw='cd $HOME/Netatmo/embedded/firmware' alias fw='cd $HOME/Netatmo/embedded/firmware'

View File

View File

@ -10,7 +10,7 @@
[keybindings] [keybindings]
[profiles] [profiles]
[[default]] [[default]]
background_darkness = 0.6 background_darkness = 0.7
background_type = transparent background_type = transparent
cursor_color = "#908c8c" cursor_color = "#908c8c"
font = Monospace 11 font = Monospace 11