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.
Assuming you have a remote called "repo.or.cz":
git remote add repo.or.cz
ssh://nico...@repo.or.cz/srv/git/barry/progweb.git
Then after the pull --rebase, you can do a forced push:
git push -f repo.or.cz master
Since Barry is technically in a feature freeze right now, except for
documentation and binary packaging, there shouldn't be too many
conflicts.
Hope that helps,
- Chris
------------------------------------------------------------------------------
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
Barry-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/barry-devel
