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.
2011/2/23 Iñaki Baz Castillo ibc@aliax.net:
Suggestions please? thanks a lot.
Options a) seems to work :)
On 2/23/11 1:49 AM, Iñaki Baz Castillo wrote:
2011/2/23 Iñaki Baz Castilloibc@aliax.net:
Suggestions please? thanks a lot.
Options a) seems to work :)
:-)
Sometimes I do also git cherry-pick between local branches - just another option.
Cheers, Daniel
2011/2/23 Daniel-Constantin Mierla miconda@gmail.com:
On 2/23/11 1:49 AM, Iñaki Baz Castillo wrote:
2011/2/23 Iñaki Baz Castilloibc@aliax.net:
Suggestions please? thanks a lot.
Options a) seems to work :)
:-)
Sometimes I do also git cherry-pick between local branches - just another option.
Thanks Daniel. Could you please describe hoy you do such cherry-pick? is the option b) above?
On Wednesday 23 February 2011, Iñaki Baz Castillo wrote:
2011/2/23 Daniel-Constantin Mierla miconda@gmail.com:
On 2/23/11 1:49 AM, Iñaki Baz Castillo wrote:
2011/2/23 Iñaki Baz Castilloibc@aliax.net:
Suggestions please? thanks a lot.
Sometimes I do also git cherry-pick between local branches - just another option.
Thanks Daniel. Could you please describe hoy you do such cherry-pick? is the option b) above?
Hi Iñaki,
i use cherry pick just like this:
git cherry-pick -x $commit_id_source_branch
executed in the tree switched to the destination branch. But so far i only did it with remote trees, if i remember correctly.
Cheers,
Henning
2011/2/24 Henning Westerholt henning.westerholt@1und1.de:
Hi Iñaki,
i use cherry pick just like this:
git cherry-pick -x $commit_id_source_branch
executed in the tree switched to the destination branch. But so far i only did it with remote trees, if i remember correctly.
I see, thanks a lot :)
-
Daniel-Constantin Mierla -
Henning Westerholt -
Iñaki Baz Castillo