From: Thomas Rast <trast@student.ethz.ch>
To: "Robert Anderson" <rwa000@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-svn: commit all changes as one svn revision?
Date: Fri, 23 May 2008 18:31:30 +0200 [thread overview]
Message-ID: <200805231831.42984.trast@student.ethz.ch> (raw)
In-Reply-To: <9af502e50805230908t76c9b26exd36cfb6d0f1a9bcf@mail.gmail.com>
You wrote:
> I make a bunch of git commits developing something that was checked
> out from a svn repo using git-svn. I want to commit all the changes
> since my last dcommit as one revision, rather than having each git
> commit checked in separately, as dcommit behaves.
I usually do
$ git checkout -b side master
... edit, commit ...
$ git checkout master
$ git merge --no-ff side
$ git-svn dcommit
The resulting merge commit looks like a normal merge to Git (keeping
history intact), but like a squashed commit of all changes on 'side'
to SVN.
(If you made all commits on master, you can branch 'side' and hard
reset master to origin/master first.)
- Thomas
--
Thomas Rast
trast@student.ethz.ch
prev parent reply other threads:[~2008-05-23 16:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-23 16:08 git-svn: commit all changes as one svn revision? Robert Anderson
2008-05-23 16:22 ` Thomas Harning
2008-05-23 16:31 ` Thomas Rast [this message]
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=200805231831.42984.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=rwa000@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).