nixpkgs/pkgs/applications/version-management/git-and-tools/git
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
..
default.nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
docbook2texi.patch git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
git-send-email-honor-PATH.patch git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
git-sh-i18n.patch git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
installCheck-path.patch git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
ssh-path.patch git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
update.sh git: Add update script 2019-04-07 09:15:28 -04:00