diff mbox

[4/6] gitignore: ignore *.patch files

Message ID 1430153133-30988-5-git-send-email-cota@braap.org
State New
Headers show

Commit Message

Emilio Cota April 27, 2015, 4:45 p.m. UTC
Signed-off-by: Emilio G. Cota <cota@braap.org>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

Comments

Peter Crosthwaite April 27, 2015, 6:11 p.m. UTC | #1
On Mon, Apr 27, 2015 at 9:45 AM, Emilio G. Cota <cota@braap.org> wrote:
> Signed-off-by: Emilio G. Cota <cota@braap.org>
> ---
>  .gitignore | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/.gitignore b/.gitignore
> index aed0e1f..025a841 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -62,6 +62,7 @@
>  *.fn
>  *.ky
>  *.log
> +*.patch

This Issue is discussed and I think it was concluded to not gitignore
patches. See:

commit f3a22014e94dfaacb57277dafce66b41cd994869
Author: Michael Tokarev <mjt@tls.msk.ru>
Date:   Thu Jun 6 01:14:54 2013 +0400

    gitignore: unignore *.patch

    This partially reverts:

     commit 082369e62c5bbaba89f173c2b803bc24115bb111
     Author: liguang <lig.fnst@cn.fujitsu.com>
     Date:   Fri Mar 22 16:44:13 2013 +0800

        gitignore: ignore more files

    I'm not sure how this went in.  The thing is that
    ignoring *.patch, in my opinion, is just wrong.
    Especially for downstreams who apply patches for
    real.

    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


Regards,
Peter


>  *.pdf
>  *.pod
>  *.cps
> --
> 1.9.1
>
>
Eric Blake April 27, 2015, 6:28 p.m. UTC | #2
On 04/27/2015 12:11 PM, Peter Crosthwaite wrote:

>> +++ b/.gitignore
>> @@ -62,6 +62,7 @@
>>  *.fn
>>  *.ky
>>  *.log
>> +*.patch
> 
> This Issue is discussed and I think it was concluded to not gitignore
> patches. See:
> 
> commit f3a22014e94dfaacb57277dafce66b41cd994869
> Author: Michael Tokarev <mjt@tls.msk.ru>
> Date:   Thu Jun 6 01:14:54 2013 +0400
> 
>     gitignore: unignore *.patch

You can always ignore them locally:
echo '*.patch' >> .git/info/exclude

without requiring everyone to ignore them (I actually like seeing them
show up, to know when I have not yet hit send on a series).
Emilio Cota April 27, 2015, 8:18 p.m. UTC | #3
On Mon, Apr 27, 2015 at 12:28:00 -0600, Eric Blake wrote:
> On 04/27/2015 12:11 PM, Peter Crosthwaite wrote:
> > This Issue is discussed and I think it was concluded to not gitignore
> > patches. See:
> > 
> > commit f3a22014e94dfaacb57277dafce66b41cd994869
> > Author: Michael Tokarev <mjt@tls.msk.ru>
> > Date:   Thu Jun 6 01:14:54 2013 +0400
> > 
> >     gitignore: unignore *.patch
> 
> You can always ignore them locally:
> echo '*.patch' >> .git/info/exclude
> 
> without requiring everyone to ignore them (I actually like seeing them
> show up, to know when I have not yet hit send on a series).

Thanks for the tip!

All: please ignore this patch in the series.

		Emilio
diff mbox

Patch

diff --git a/.gitignore b/.gitignore
index aed0e1f..025a841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ 
 *.fn
 *.ky
 *.log
+*.patch
 *.pdf
 *.pod
 *.cps