From: Fabien Thomas <thomas.fabien@gmail.com>
To: git@vger.kernel.org
Cc: martin f krafft <madduck@madduck.net>
Subject: Re: [topgit] shared topic branch
Date: Tue, 27 Jan 2009 08:23:19 +0100 [thread overview]
Message-ID: <111E5FDD-FC51-4DD2-9959-676003CD7A61@gmail.com> (raw)
In-Reply-To: <20090126120049.GA9676@lapse.rw.madduck.net>
[-- Attachment #1: Type: text/plain, Size: 1398 bytes --]
>> I'm testing topgit 0.5 in a shared env. (multiple user working on
>> same
>> patch).
>
> Sorry for the late reply!
Thanks to reply :)
>
>
>> My problem is that when i want to push my local work i'm doing
>> "git push" that will force update the remote branch. The problem
>> is that each time master is not up to date i will push my entire
>> master or topic branch to the remote.
>
> I do not understand what you mean. Could yo please try to give us
> more detail? git push is intended to push all local changes to the
> remote, so I don't understand what your problem is.
I'm new to topgit and to git so maybe there is something i've
misunderstood:
on the git side:
the + will overwrite all remote location branche named with that
pattern ?
on topgit:
i'm just doing patches on two computer (home+work) and i'm pushing on
a central repo to "backup/share my changes"
if i'm not up to date and i start a push with the "+" will overwrite
the central repo with my local branch. (overwrite of my central repo
master branch and my topics)
to "solve" my problem i've replaced the remote section with this:
[remote "origin"]
url = ssh://git@xxx.com
fetch = refs/heads/*:refs/remotes/origin/*
fetch = refs/top-bases/*:refs/remotes/origin/top-bases/*
push = refs/top-bases/*:refs/top-bases/*
push = refs/heads/topic/*:refs/heads/topic/*
is it more clear?
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 1860 bytes --]
next prev parent reply other threads:[~2009-01-27 7:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-18 20:02 [topgit] shared topic branch Fabien Thomas
2009-01-26 12:00 ` martin f krafft
2009-01-27 7:23 ` Fabien Thomas [this message]
2009-01-30 10:15 ` martin f krafft
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=111E5FDD-FC51-4DD2-9959-676003CD7A61@gmail.com \
--to=thomas.fabien@gmail.com \
--cc=git@vger.kernel.org \
--cc=madduck@madduck.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox