diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 455d5238fa..75b983aada 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ -<<<<<<< HEAD -*.o +# .gitignore for illumos checkouts. +# Note: this does not try to ignore all files in a fully built workspace. +# Rather, you are expected to "make clobber" before running "git status". +cscope.files +cscope.out +ncscope.out +cscope.in.out +cscope.po.out .make.state* +*.o *.po *.so *.so.1 |