All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pascal Obry <pascal@obry.net>
To: Samuel Tardieu <sam@rfc1149.net>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase, file permissions and removed file
Date: Mon, 27 Oct 2008 18:12:54 +0100	[thread overview]
Message-ID: <4905F696.2080406@obry.net> (raw)
In-Reply-To: <2008-10-27-17-39-43+trackit+sam@rfc1149.net>

Samuel Tardieu a écrit :
> Why do you do a "rebase" in this case rather than a merge? Doesn't it
> make little sense to record a permission change on a *deleted* file?

Because this is in the context of git-svn, and I really want to rebase
my work before pushing it back to the Subversion repository.

-- 

--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595

      reply	other threads:[~2008-10-27 17:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-27 14:02 rebase, file permissions and removed file Pascal Obry
2008-10-27 14:38 ` Johannes Sixt
2008-10-27 15:09   ` Pascal Obry
2008-10-27 15:21     ` Johannes Sixt
2008-10-27 15:33       ` Pascal Obry
2008-10-27 16:39         ` Samuel Tardieu
2008-10-27 17:12           ` Pascal Obry [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=4905F696.2080406@obry.net \
    --to=pascal@obry.net \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.net \
    --cc=sam@rfc1149.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 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.