Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64d3fb2fbfda
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61381699334c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 22, 2018

  1. .gitattributes: merge=union for all-packages.nix 

    also module-list.nix
    @matthewbauer
    matthewbauer authored Mar 22, 2018
    Copy the full SHA
    6138169 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 .gitattributes
3 changes: 3 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -11,3 +11,6 @@ doc/default.nix linguist-documentation=false

nixos/doc/** linguist-documentation
nixos/doc/default.nix linguist-documentation=false

nixos/modules/module-list.nix merge=union
pkgs/top-level/all-packages.nix merge=union