GIT most used comands
GIT log and info
set alias into .bashrc vimlog
alias gitlog='git log --all --oneline --graph'
to see diferences betwen branches write .. betwen branches
git diff branch_a..branch_b
GIT Commit
when I sure
git commit -m -a "message"
when not it allows check the diferences
git add -p
GIT branch
create a branch called features
git checkout -b features
merge into branch into master git checkout master to go to master and the
git merge features. if there is confilcs resolve or file to file editing one by one
or use git mergetool it opens a nice tool based in vimlo
git checkout --theirs or git checkout --ours in case you wan take iether feture or master
GIT rebase
Use rebase when you want get all the master o shared repo to you personal branch
Cap comentari:
Publica un comentari a l'entrada