lame -b 320 --preset insane -q 0 input.wav
git rebase -i 07631121ef7b2d8e850c6cdd744ca202d68ad654^ #replace numbers with SHA-1 of your commit
# use X for deleting chars
# use A for entering INSERT mode
# replace `pick` with `edit`
# press ESC to exit INSERT mode
# press `:wq` for Save & Exit
git reset HEAD^
git add ...
git commit -m "First part"
git checkout develop
git merge -s ours master -m "Replace master with develop" --log
git checkout master
git merge develop
git push --all
Current branch will be updated to master, and then all new commits in it will be moved to head.
Not pushed
git fetch
git rebase origin/master
Pushed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/** | |
* Wrapper for showing custom fancybox popup | |
* Parametrs: (header,content,buttonText,settings) | |
* header - popup header text | |
* content - popup content html | |
* buttonText - name of popup bottom button, set '' or not set for remove button | |
* settings: | |
* - style: popup css modificator for style, 'default' by default | |
* - event: popup css modificator for set popup identification, 'default' by default | |
* - hasCloseButton: TRUE by default, set FALSE for hidding close button |