diff options
| author | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-07-24 23:53:17 +0200 |
| commit | cbe96f14700f4805552c47d5f163a75c35f86575 (patch) | |
| tree | d7791d29b283507bb8953a292d764b24774c955c /.gitignore | |
| parent | 337333c2567bdf767fdc8e04520c4bc0c8b33784 (diff) | |
| parent | 7a9a27a051a04a7fee2e7fe40127fedbe9112cfd (diff) | |
| download | guix-cbe96f14700f4805552c47d5f163a75c35f86575.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 05a68b69ff..f630444a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ /doc/stamp-vti /doc/version.texi /doc/version-*.texi +/etc/committer.scm /etc/gnu-store.mount /etc/guix-daemon.cil /etc/guix-daemon.conf @@ -88,17 +89,8 @@ /m4/nls.m4 /m4/po.m4 /m4/progtest.m4 -/nix-setuid-helper -/nix/AUTHORS -/nix/COPYING /nix/config.h /nix/config.h.in -/nix/nix-daemon/nix-daemon.cc -/nix/nix-setuid-helper/nix-setuid-helper.cc -/nix/scripts/authenticate -/nix/scripts/list-runtime-roots -/nix/scripts/offload -/nix/scripts/substitute /po/doc/*.mo /po/guix/*.gmo /po/guix/*.insert-header |