All of lore.kernel.org
 help / color / mirror / Atom feed
From: Seth Falcon <sethfalcon@gmail.com>
To: "Joakim Tjernlund" <joakim.tjernlund@transmode.se>
Cc: <git@vger.kernel.org>
Subject: Re: git-svn and rebase causes duplicate  log entries in svn
Date: Tue, 14 Nov 2006 14:55:36 -0800	[thread overview]
Message-ID: <m2zmatiqon.fsf@ziti.local> (raw)
In-Reply-To: <00ff01c70836$ba7e3d00$1e67a8c0@Jocke> (Joakim Tjernlund's message of "Tue, 14 Nov 2006 22:49:14 +0100")

Hi Joakim,

"Joakim Tjernlund" <joakim.tjernlund@transmode.se> writes:
> Now I want to rebase my svn branch against latest u-boot and commit
> my rebased svn branch to svn.
>
> I use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest
> changes and when I do so I see my local changes once more in the svn
> log:
> Any way to avoid that?

I think you want to use git-svn dcommit, and not commit.  See the
notes in the git-svn man page.  The basic workflow
that I've been using is:

git-svn fetch  
git rebase remotes/git-svn  ## on mybranch
## make commits on mybranch
git-svn dcommit remotes/git-svn..mybranch

This results in each commit that I made on mybranch being sent to svn
as a separate commit.


  reply	other threads:[~2006-11-14 22:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-14 21:49 git-svn and rebase causes duplicate log entries in svn Joakim Tjernlund
2006-11-14 22:55 ` Seth Falcon [this message]
2006-11-15 10:14   ` Joakim Tjernlund

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=m2zmatiqon.fsf@ziti.local \
    --to=sethfalcon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=joakim.tjernlund@transmode.se \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.