Le mercredi 05 août 2009 à 19:21 -0400, Chris Frey a écrit :
> On Wed, Aug 05, 2009 at 08:28:00PM +0200, Nicolas wrote:
> > Now, I want sync regulary this work in the GIT fork :
> > git://repo.or.cz/barry/progweb.git
> > (http://repo.or.cz/w/barry/progweb.git)
> >
> > So :
> > for (;;) {
> > <make changements>
> >
> > $ git add <my modified files>
> > $ git commit
> >
> > $ git pull --rebase
> >
> > <??? publish in my GIT fork ????>
>
>
> You'll use a git-push command. You may want to use your own branch
> for your development, or master is fine too.
>
> You're using --rebase, which is very kind of you. :-) The other way is to
> do merges. With rebase, you need to do a forced push to the repo,
> while with merges, a regular push is used.
Thank's
An other question.
git pull --rebase force me to push to the repo.
But, I don't know an other solution (with rebase feature).
If I make :
for (;;) {
$ git fetch
$ git merge master
<continue to dev>
$ git commit
}
$ git rebase origin/master
$ git format-patch origin/master
OR
$ git push -f progweb master
In fact, if I "rebase", I have to force the push...
Regards,
--
Nicolas VIVIEN
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Barry-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/barry-devel
