Commit Graph

1845 Commits

Author SHA1 Message Date
Ivan Malison
0c98c6bbc4
git-sync: unstable-2015-10-24 -> unstable-2021-07-14 (#130306)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-16 00:04:43 +02:00
edef
1630eccc5f
Merge pull request #128062 from deviant/git-shell-path
git: add shellPath passthru
2021-07-14 01:10:13 +00:00
Sandro
97bceacca5
Merge pull request #130129 from SuperSandro2000/delta
delta: 0.8.2 -> 0.8.3
2021-07-14 00:33:50 +02:00
Sandro
bc947a686c
Merge pull request #130052 from DeeUnderscore/git-cola-no-double-wrap 2021-07-13 23:44:44 +02:00
Sandro Jäckel
b3f974ee08
delta: 0.8.2 -> 0.8.3 2021-07-13 22:38:27 +02:00
R. RyanTM
9e18ae4302 git-vendor: 1.2.1 -> 1.2.2 2021-07-13 12:00:56 +02:00
D Anzorge
e3e3baf498 git-cola: avoid double wrapping 2021-07-12 23:10:48 +02:00
R. RyanTM
ad28b7f106 git-cola: 3.9 -> 3.10.1 2021-07-12 03:48:36 +00:00
R. RyanTM
da1dde42fb gitui: 0.16.1 -> 0.16.2 2021-07-10 22:26:39 +00:00
Fabian Affolter
193c06f5f2 bit: 1.1.1 -> 1.1.2 2021-07-05 22:59:53 +02:00
zowoq
c7e7f90108 gh: 1.12.0 -> 1.12.1
https://github.com/cli/cli/releases/tag/v1.12.1
2021-07-01 12:53:09 +10:00
Sandro
3adb7f66d2
Merge pull request #128660 from zowoq/delta
delta: 0.8.1 -> 0.8.2
2021-06-30 01:11:43 +02:00
zowoq
5edaead2dc delta: 0.8.1 -> 0.8.2
https://github.com/dandavison/delta/releases/tag/0.8.2
2021-06-30 06:12:32 +10:00
zowoq
d7ea598b27 gh: 1.11.0 -> 1.12.0
https://github.com/cli/cli/releases/tag/v1.12.0
2021-06-30 06:09:55 +10:00
Robert Schütz
d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
zowoq
cd50708ec8 delta: 0.8.0 -> 0.8.1
https://github.com/dandavison/delta/releases/tag/0.8.1
2021-06-25 21:45:25 +09:00
github-actions[bot]
bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Sandro
959014ce29
Merge pull request #127816 from VirtusLab/git-machete-3.2.1
gitAndTools.git-machete: 3.2.0 -> 3.2.1
2021-06-25 11:12:10 +02:00
Robert Schütz
c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
V
56f5cd3343 git: add shellPath passthru
git features a restricted login shell for allowing Git-only SSH access.
2021-06-25 03:26:19 +02:00
Niklas Hambüchen
d22a561225 git-branchless: init at 0.3.2 2021-06-24 13:27:19 +02:00
Git Machete Release Bot
9c9f7cc27b gitAndTools.git-machete: 3.2.0 -> 3.2.1
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
2021-06-22 17:29:34 +00:00
Martin Weinelt
eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Maximilian Bosch
8e25802249
Merge pull request #127301 from r-ryantm/auto-update/gitstatus
gitstatus: 1.5.1 -> 1.5.2
2021-06-20 19:37:59 +02:00
github-actions[bot]
4ea74538ce
Merge master into staging-next 2021-06-18 18:04:25 +00:00
Sandro
13fcfce0af
Merge pull request #127228 from r-ryantm/auto-update/ghr
ghr: 0.13.0 -> 0.14.0
2021-06-18 17:10:42 +02:00
R. RyanTM
08aaf68511 gitstatus: 1.5.1 -> 1.5.2 2021-06-18 05:43:45 +00:00
R. RyanTM
3ac01fa851 ghr: 0.13.0 -> 0.14.0 2021-06-17 15:04:40 +00:00
github-actions[bot]
b859981601
Merge master into staging-next 2021-06-17 12:05:01 +00:00
Sandro
7b229db9e4
Merge pull request #127119 from VirtusLab/git-machete-3.2.0 2021-06-17 13:38:31 +02:00
github-actions[bot]
538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot]
51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Sandro
eaef571d76
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
git: fix pkgsStatic build
2021-06-17 01:10:00 +02:00
github-actions[bot]
8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot]
2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Git Machete Release Bot
8aebc1b904 gitAndTools.git-machete: 3.1.1 -> 3.2.0
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
2021-06-16 17:56:47 +00:00
Thomas Gerbet
fc1c4bab77 git: fix pkgsStatic build 2021-06-16 18:46:39 +02:00
Sandro
4d5f3b8d93
Merge pull request #127022 from r-ryantm/auto-update/glab
glab: 1.18.0 -> 1.18.1
2021-06-16 18:25:26 +02:00
github-actions[bot]
f060a3768b
Merge master into staging-next 2021-06-16 06:04:41 +00:00
R. RyanTM
76ceead4ec lefthook: 0.7.5 -> 0.7.6 2021-06-15 20:01:41 -07:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
R. RyanTM
29cf0172e0 glab: 1.18.0 -> 1.18.1 2021-06-16 01:39:44 +00:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Maximilian Bosch
d387353590
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
ChangeLog: https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.4.2
2021-06-14 22:36:43 +02:00
Martin Weinelt
38b5368b7e
gitAndTools.gitstatus: 1.4.4 -> 1.5.1 2021-06-10 21:35:57 +02:00
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
github-actions[bot]
51dce04dde
Merge master into staging-next 2021-06-10 12:05:05 +00:00
Mario Rodas
1027d970df
Merge pull request #126152 from r-ryantm/auto-update/git-filter-repo
git-filter-repo: 2.29.0 -> 2.32.0
2021-06-10 05:38:19 -05:00
github-actions[bot]
cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00