[sr-dev] Help with Git for commiting changes in a module

Iñaki Baz Castillo ibc at aliax.net
Wed Feb 23 01:42:37 CET 2011


Hi, I've coded some modifications to regex module in my local branch
ibc/regex. I've also commited the branch to the server with same name
ibc/regex.

Now my question is: how to commit such changes into remote master?
Some options I've in mind:


a) Commit from my local ibc/regex branch to remote branch, and later
update my local master branch:

~# git branch
ibc/regex
~# git push origin ibc/regex:master
~# git fetch origin
~#  git pull --rebase origin master


b) Merging my local ibc/regex module into my local master branch and
commit to remote master:

~# git checkout master
~# git merge --log --no-ff ibc/regex
~# git push origin master:master



Suggestions please? thanks a lot.

-- 
Iñaki Baz Castillo
<ibc at aliax.net>



More information about the sr-dev mailing list