[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <m3pr3jkq26.fsf@localhost.localdomain>
Date: Fri, 05 Mar 2010 02:43:29 -0800 (PST)
From: Jakub Narebski <jnareb@...il.com>
To: Jiri Slaby <jslaby@...e.cz>
Cc: Andrew Morton <akpm@...ux-foundation.org>, git@...r.kernel.org,
linux-kernel@...r.kernel.org, jirislaby@...il.com,
Johannes Sixt <j.sixt@...covery.net>
Subject: Re: [PATCH 1/1] gitignore: do not ignore include/linux/
Jiri Slaby <jslaby@...e.cz> writes:
> linux entry in .gitignore means that everything in include/linux/
> gets ignored with git 1.7.
>
> Prepend a slash to entries which are toplevel to avoid that
>
> Signed-off-by: Jiri Slaby <jslaby@...e.cz>
> Cc: Johannes Sixt <j.sixt@...covery.net>
> ---
> .gitignore | 20 ++++++++++----------
> 1 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/.gitignore b/.gitignore
> index efab0eb..fe6ebb9 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -34,16 +34,16 @@ modules.builtin
> #
> # Top-level generic files
> #
> -tags
> -TAGS
> -linux
> -vmlinux
> -vmlinuz
> -System.map
> -Module.markers
> -Module.symvers
> -!.gitignore
> -!.mailmap
> +/tags
> +/TAGS
> +/linux
> +/vmlinux
> +/vmlinuz
> +/System.map
> +/Module.markers
> +/Module.symvers
> +!/.gitignore
> +!/.mailmap
>
> #
> # Generated include files
Actually you want to *not ignore* .gitignore and .mailmap (and
.gitattributes which is missing here) anywhere, not only as top-level
file. So .gitignore and .mailmap should not be prepended with slash.
#
# Top-level generic files
#
-tags
-TAGS
-linux
-vmlinux
-vmlinuz
-System.map
-Module.markers
-Module.symvers
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
!.gitignore
!.mailmap
--
Jakub Narebski
Poland
ShadeHawk on #git
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists