From: Fabien Thomas <thomas.fabien@gmail.com>
To: git@vger.kernel.org
Subject: [topgit] shared topic branch
Date: Thu, 18 Dec 2008 21:02:33 +0100 [thread overview]
Message-ID: <EFB70468-7900-4B22-925D-3FC5F05F951B@gmail.com> (raw)
Hi,
I'm testing topgit 0.5 in a shared env. (multiple user working on same
patch).
After following the tutorial i end up with something like this:
$ git branch
master
topic/test1
* topic/test2
$ git branch -r
origin/HEAD
origin/master
origin/svn_stable_7
origin/svn_trunk
origin/top-bases/topic/test1
origin/top-bases/topic/test2
origin/topic/test1
origin/topic/test2
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.
After looking at git config file it seems that this is something
normal generated by "tg remote --populate origin":
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[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/*:refs/heads/*
[branch "master"]
remote = origin
merge = refs/heads/master
[merge "ours"]
name = \"always keep ours\" merge driver
driver = touch %A
[topgit]
remote = origin
What i'm doing wrong ?
Regards,
Fabien
next reply other threads:[~2008-12-18 20:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-18 20:02 Fabien Thomas [this message]
2009-01-26 12:00 ` [topgit] shared topic branch martin f krafft
2009-01-27 7:23 ` Fabien Thomas
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=EFB70468-7900-4B22-925D-3FC5F05F951B@gmail.com \
--to=thomas.fabien@gmail.com \
--cc=git@vger.kernel.org \
/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