about summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-08-31T13·49-0400
committerShea Levy <shea@shealevy.com>2016-08-31T13·49-0400
commit572aba284a161cb94532cec297785266ee719b99 (patch)
tree6bea5880b76947b51f64ee76293a99aedd977612 /.gitignore
parentaa1ea0d1e4720b8bf9f0e9c485e4712e0c915818 (diff)
parent59124228b3ac6120e73bc6a88b2c633a70bdf0fc (diff)
Merge branch 'nix-channel-c++'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 69152741e0..c9e3969969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,6 @@ Makefile.config
 /scripts/nix-switch
 /scripts/nix-collect-garbage
 /scripts/nix-prefetch-url
-/scripts/nix-channel
 /scripts/nix-build
 /scripts/nix-copy-closure
 /scripts/NixConfig.pm
@@ -72,6 +71,9 @@ Makefile.config
 # /src/nix-daemon/
 /src/nix-daemon/nix-daemon
 
+# /src/nix-channel/
+/src/nix-channel/nix-channel
+
 # /src/download-via-ssh/
 /src/download-via-ssh/download-via-ssh