diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-03-20 17:45:49 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-03-20 17:45:49 +0000 |
| commit | 76436dc0854d1e18a76ccb58a9b496a0e93ae7c7 (patch) | |
| tree | 80c482eb82eb7a55bb735e6502b6171d38b8290e /.gitignore | |
| parent | ad740f5f23aca9052a27984d4912ec9379c611bf (diff) | |
| parent | 00277c9e43668ff248a12ee635ce125957750373 (diff) | |
| download | illumos-joyent-76436dc0854d1e18a76ccb58a9b496a0e93ae7c7.tar.gz | |
[illumos-gate merge]20140320release-20140320
commit 00277c9e43668ff248a12ee635ce125957750373
3243 Add shadow support to getent(1)
commit 04dfc08aa8f2f35510c97c3e9e543a45d0c5b7af
4625 add cscope output to .gitignore
Conflicts:
.gitignore
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 |