[PATCH 1/5] .gitignore: match ncscope.out

[PATCH 1/5] .gitignore: match ncscope.out

[Masahiro Yamada]

From: Jike Song <albcamus@gmail.com>

Sometimes I got this:

    $ git-status
    {snip}
    # On branch master
    # Untracked files:
    #   (use "git add <file>..." to include in what will be committed)
    #
    #       ncscope.out
    nothing added to commit but untracked files present (use "git add"
to track)

Fix it.

Signed-off-by: Jike Song <albcamus@gmail.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
[ imported from Linux Kernel, commit 9723c046bd59 ]
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 03c5e20..b6d1b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
 
 # patches
 *.patch
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/5] gitignore: Add GNU GLOBAL files to top .gitignore

[Masahiro Yamada]

From: Jani Nikula <ext-jani.1.nikula@nokia.com>

Ignore GPATH, GRTAGS, GSYMS, and GTAGS generated by GNU GLOBAL.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
[ imported from Linux Kernel, commit f2ac5e78928b ]
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

---

 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index b6d1b67..fe29da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,5 +81,11 @@ series
 cscope.*
 ncscope.*
 
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
 # patches
 *.patch
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/5] gitignore: add all.config

[Masahiro Yamada]

From: Borislav Petkov <bp@suse.de>

This is used by kbuild to load preset Kconfig options.  We need to
ignore it, otherwise git clean kills it.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[ imported from Linux Kernel, commit 25fba9bebeb7 ]
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

---

 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index fe29da5..029520c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,6 @@ GTAGS
 
 # patches
 *.patch
+
+# Kconfig presets
+all.config
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/5] gitignore: do not ignore .mailmap

[Masahiro Yamada]

Commit eb4b20d20631 (add .mailmap for proper git-shortlog output)
introduced .mailmap file.  It should not be ignored.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 029520c..34e74a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ barebox_default_env*
 # git files that we don't want to ignore even it they are dot-files
 #
 !.gitignore
+!.mailmap
 
 #
 # Generated include files
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/5] gitignore: remove bogus ignore patterns

[Masahiro Yamada]

asm-offsets.h and compile.h are generated under include/generated/
directory now.
The directory include/generated/ is already ignored.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34e74a1..74d24ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,9 +62,7 @@ barebox_default_env*
 #
 # Generated include files
 #
-include/asm-*/asm-offsets.h
 include/config
-include/linux/compile.h
 include/generated
 
 # Generated files
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox