diff options
author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·20+0100 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·45+0100 |
commit | f4609b896fac842433bd495c166d5987852a6a73 (patch) | |
tree | 95511c465c54c4f5d27e5d39ce187e2a1dd82bd3 /third_party/git/t/t6434-merge-recursive-rename-options.sh | |
parent | 082c006c04343a78d87b6c6ab3608c25d6213c3f (diff) |
merge(3p/git): Merge git subtree at v2.29.2 r/1890
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
Diffstat (limited to '')
-rwxr-xr-x | third_party/git/t/t6434-merge-recursive-rename-options.sh (renamed from third_party/git/t/t3034-merge-recursive-rename-options.sh) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/third_party/git/t/t3034-merge-recursive-rename-options.sh b/third_party/git/t/t6434-merge-recursive-rename-options.sh
index 3d9fae68c41c..3d9fae68c41c 100755
--- a/third_party/git/t/t3034-merge-recursive-rename-options.sh
+++ b/third_party/git/t/t6434-merge-recursive-rename-options.sh
|