From: Matthieu Stigler <matthieu.stigler@gmail.com>
To: git@vger.kernel.org
Cc: Florian Weimer <fw@deneb.enyo.de>
Subject: Re: Confusion using git on svn server
Date: Sun, 21 Jun 2009 11:09:18 +0200 [thread overview]
Message-ID: <4A3DF8BE.2050504@gmail.com> (raw)
In-Reply-To: <87zlc258nj.fsf@mid.deneb.enyo.de>
Florian Weimer a écrit :
> * Matthieu Stigler:
>
>
>> My main concern is that in my git log, I have a commit and its
>> "revert", will it be sent as two different commits to svn? I would
>> love they are not sent at all as they represent a "neutral" operation.
>>
>
> They will be sent as a separate commits by default.
>
> You can use "git rebase -i git-svn" to edit your local history before
> submitting it, though.
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Excellent! This is exactly what I was looking for, thanks!
I had a minor issue as the commits I wanted to remove (a modif and its
revert) were the last one, so I could not remove both in the same time,
as said:
However, if you remove everything, the rebase will be aborted.
So I just added a minor third commit in order to remove the two first.
Is there a better way to do than this workaround? Something with git
rebase --onto (two last?)
Thanks a lot!
next prev parent reply other threads:[~2009-06-21 9:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-20 20:28 Confusion using git on svn server Matthieu Stigler
2009-06-21 7:49 ` Florian Weimer
2009-06-21 9:09 ` Matthieu Stigler [this message]
2009-06-21 9:32 ` Florian Weimer
[not found] ` <fabb9a1e0906212304o2b61d081i4cf72300be8bd775@mail.gmail.com>
2009-06-22 6:16 ` Florian Weimer
-- strict thread matches above, loose matches on Subject: below --
2009-06-20 20:26 Matthieu Stigler
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=4A3DF8BE.2050504@gmail.com \
--to=matthieu.stigler@gmail.com \
--cc=fw@deneb.enyo.de \
--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 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.