diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
commit | d1a914082b7e53636f9801769ef96218b2125c4b (patch) | |
tree | 998805fc59fe0b1bb105b24a6a79fff646257d96 /.gitignore | |
parent | 657fb6c947d94cf946f29cd24e88bd080c01ff0a (diff) | |
parent | ae548434337cddf9677a4cd52b9370810b2cc9b6 (diff) | |
download | patches-d1a914082b7e53636f9801769ef96218b2125c4b.tar patches-d1a914082b7e53636f9801769ef96218b2125c4b.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1fc22d7e93..09dbde82fc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ *.tar.xz *.tmp *~ +.#* +\#*\# ,* /ABOUT-NLS /INSTALL @@ -31,6 +33,7 @@ /doc/guix.cps /doc/guix.fn /doc/guix.fns +/doc/guix.html /doc/guix.info /doc/guix.info-[0-9] /doc/guix.ky @@ -125,3 +128,4 @@ tmp /doc/os-config-lightweight-desktop.texi /nix/scripts/download /etc/indent-code.el +/.version |