Entradas

Mostrando entradas de julio, 2017

AWK: n lines before, m lines after

awk 'c-->0; $0~s{if(b)for(c=b+1;c>1;c--)print r[(NR-c+1)%b];print;c=a}b{r[NR%b]=$0}' b=3 a=5 s="cadenita" short.txt

Git Merge

git granch                        # local branches git branch -r                   # remote branches git branch -a                   # local and remote branches git status                         # current branch status git checkout develop      # go to "develop" branch git checkout hotfix/tk_01_inv     # go to "hotfix/tk_01_inv" branch git pull    # download the remote changes into current branch git add .    # save all changes git commit -m 'some comment'    # commit into local branch git push      # public my local changes into remote git repository git merge : "develop" branch gets changes from "hotfix/tk_01_inv" branch git branch -a     # local and remote branches git status git checkout hotfix/tk_01_inv   # branch with new changes git pull gi push git checkout develop git pull git status git merge --no-ff hotfix/tk_01_inv git status git push