diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-07 13:28:59 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:09:45 +0000 |
| commit | 4a61c88554d689fbdb891d566bd8a7d9a3be794e (patch) | |
| tree | 4326bfbab3db026d7e43e1cd0d2e00cddf2375b4 /modules/shell | |
| parent | 3ff17ba77e59ca4de6f037ea4eaf4d21f760e3a5 (diff) | |
| download | nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.tar nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.tar.gz nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.tar.bz2 nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.tar.lz nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.tar.xz nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.tar.zst nixlib-4a61c88554d689fbdb891d566bd8a7d9a3be794e.zip | |
modules/git: set push.default = upstream
This means when I push my nixpkgs-master branch to nixpkgs, it actually goes to master, rather than creating a new nixpkgs-master branch.
Diffstat (limited to 'modules/shell')
| -rw-r--r-- | modules/shell/git/config.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in index 7c039ae0a45e..3630759a5a32 100644 --- a/modules/shell/git/config.in +++ b/modules/shell/git/config.in @@ -51,6 +51,6 @@ conflictstyle = diff3 tool = opendiff [push] - default = current + default = upstream [sendemail] smtpServer = @smtpServer@ |