Skip to content

Commit 4fcde2f

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 41884-fix
2 parents 927af81 + eb67eab commit 4fcde2f

File tree

2,670 files changed

+289688
-387864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,670 files changed

+289688
-387864
lines changed

.gitattributes

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
# Treat all files in the Go repo as binary, with no git magic updating
2-
# line endings. Windows users contributing to Go will need to use a
3-
# modern version of git and editors capable of LF line endings.
2+
# line endings. This produces predictable results in different environments.
3+
#
4+
# Windows users contributing to Go will need to use a modern version
5+
# of git and editors capable of LF line endings.
6+
#
7+
# Windows .bat files are known to have multiple bugs when run with LF
8+
# endings, and so they are checked in with CRLF endings, with a test
9+
# in test/winbatch.go to catch problems. (See golang.org/issue/37791.)
410
#
511
# We'll prevent accidental CRLF line endings from entering the repo
6-
# via the git-review gofmt checks.
12+
# via the git-codereview gofmt checks and tests.
713
#
8-
# See golang.org/issue/9281
14+
# See golang.org/issue/9281.
915

1016
* -text

AUTHORS

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Alexei Sholik <[email protected]>
9696
Alexey Borzenkov <[email protected]>
9797
Alexey Neganov <[email protected]>
9898
Alexey Palazhchenko <[email protected]>
99+
Alexey Semenyuk <[email protected]>
99100
Alexis Hildebrandt <[email protected]>
100101
Ali Rizvi-Santiago <[email protected]>
101102
Aliaksandr Valialkin <[email protected]>
@@ -144,6 +145,7 @@ Andy Davis <[email protected]>
144145
Andy Finkenstadt <[email protected]>
145146
Andy Lindeman <[email protected]>
146147
Andy Maloney <[email protected]>
148+
147149
Andy Walker <[email protected]>
148150
Anfernee Yongkun Gui <[email protected]>
149151
Angelo Bulfone <[email protected]>
@@ -561,6 +563,7 @@ Hitoshi Mitake <[email protected]>
561563
Holden Huang <[email protected]>
562564
Hong Ruiqi <[email protected]>
563565
Hongfei Tan <[email protected]>
566+
Hootsuite Inc.
564567
Hsin-Ho Yeh <[email protected]>
565568
Hu Keping <[email protected]>
566569
Hugues Bruant <[email protected]>
@@ -932,7 +935,7 @@ Maya Rashish <[email protected]>
932935
Mayank Kumar <[email protected]>
933936
MediaMath, Inc
934937
Meir Fischer <[email protected]>
935-
Meng Zhuo <[email protected]>
938+
936939
Meteor Development Group
937940
Mhd Sulhan <[email protected]>
938941
Micah Stetson <[email protected]>
@@ -1042,6 +1045,7 @@ Niels Widger <[email protected]>
10421045
Nigel Kerr <[email protected]>
10431046
10441047
Nikhil Benesch <[email protected]>
1048+
10451049
Niklas Schnelle <[email protected]>
10461050
Niko Dziemba <[email protected]>
10471051
Nikolay Turpitko <[email protected]>
@@ -1140,9 +1144,11 @@ Pietro Gagliardi <[email protected]>
11401144
Piyush Mishra <[email protected]>
11411145
Platform.sh
11421146
Pontus Leitzler <[email protected]>
1147+
Prasanga Siripala <[email protected]>
11431148
Prashant Varanasi <[email protected]>
11441149
Pravendra Singh <[email protected]>
11451150
Preetam Jinka <[email protected]>
1151+
Qais Patankar <[email protected]>
11461152
Qiuxuan Zhu <[email protected]>
11471153
Qualcomm Data Center, Inc.
11481154
Quan Tran <[email protected]>
@@ -1308,6 +1314,7 @@ Szabolcs Nagy <[email protected]>
13081314
Taavi Kivisik <[email protected]>
13091315
Tad Fisher <[email protected]>
13101316
Tad Glines <[email protected]>
1317+
Tailscale Inc.
13111318
Taj Khattra <[email protected]>
13121319
Takayoshi Nishida <[email protected]>
13131320
Takeshi YAMANASHI <[email protected]>
@@ -1392,6 +1399,7 @@ Upthere, Inc.
13921399
Uriel Mangado <[email protected]>
13931400
Vadim Grek <[email protected]>
13941401
Vadim Vygonets <[email protected]>
1402+
13951403
Vendasta
13961404
Veselkov Konstantin <[email protected]>
13971405
Victor Vrantchan <[email protected]>

0 commit comments

Comments
 (0)