From: "Matt Pearson" <404emailnotfound@gmail.com>
To: "Stefan Naewe" <stefan.naewe+git@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Filtering mode changes
Date: Fri, 1 Aug 2008 08:23:07 -0400 [thread overview]
Message-ID: <706b4240808010523y33694ebfjad772ef26e015cbb@mail.gmail.com> (raw)
In-Reply-To: <loom.20080801T111754-982@post.gmane.org>
On Fri, Aug 1, 2008 at 7:25 AM, Stefan Naewe <stefan.naewe+git@gmail.com> wrote:
> Hi there.
>
> Here's my story:
>
> - I did some minor modifications to a repo that I want to 'give back'.
> - I worked on my own branch (of course).
> - I was stupid to edit the files (that live on a linux box) through a windows
> network share.
> - When I created diffs (using 'git format-patch') to send send 'upstream', I
> noticed that the edited files got their executable bit set (old mode 100644 ->
> new mode 100755)
> - I created another commit to undo the mode changes.
>
> My question:
>
> Is there a way to create clean diffs (between master and my branch) that don't
> contain the 'double mode change' (from 644 to 755 to 644) ?
>
You probably want to use 'git rebase -i master' and the 'squash'
command to combine the changes into one. If multiple commits messed up
the permissions, use the 'edit' command and the rebase will stop after
the specified commits, allowing you to fix things up, then do 'git
commit --amend'. Use 'git rebase --continue' to continue fixing the
patches.
next prev parent reply other threads:[~2008-08-01 12:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 11:25 Filtering mode changes Stefan Naewe
2008-08-01 12:23 ` Matt Pearson [this message]
2008-08-01 12:32 ` Santi Béjar
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=706b4240808010523y33694ebfjad772ef26e015cbb@mail.gmail.com \
--to=404emailnotfound@gmail.com \
--cc=git@vger.kernel.org \
--cc=stefan.naewe+git@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