Gitcommands
Gitcommands
as per git local repo should have only source code not .class file
create vi .gitignore
and add *.class in insertmode
:wq
git rebase
first create f1 f2 commit in master
then checkout master
then f3 f4 f5 commit
then checkout master
then create f6 commit
then checkout test
this is called as fastforward merge.
this commits from the child branch are added to the top of master branch
this is helpful when we we want code from a branch to be reflected as the latest
working version on master
rearrange the commit order
squash
-------------------------
git rebase -i HEAD~4
remove the pick word and replace it with squash
---------------------------------------
how to selectively pickup and commit'from child branch(cherry-pick)