aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-01-14 01:03:53 -0500
committerRuss Cox <rsc@golang.org>2015-01-14 06:13:56 +0000
commitd9e0ca405570b8489e732ca9af2d3abf80b411a6 (patch)
tree4cab8c2961e86fdb747a3c19e06a981788744181
parentff2ab2991490879a8ec13e85503104dff0484234 (diff)
downloadgo-d9e0ca405570b8489e732ca9af2d3abf80b411a6.tar.gz
go-d9e0ca405570b8489e732ca9af2d3abf80b411a6.zip
[release-branch.go1.4] all: copy master .gitattributes and .gitignore
Change-Id: I10e60fb6bf2cf3daa2bc1184df7ded0a712a1905 Reviewed-on: https://go-review.googlesource.com/2806 Reviewed-by: Andrew Gerrand <adg@golang.org>
-rw-r--r--.gitattributes10
-rw-r--r--.gitignore53
2 files changed, 63 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..07953cae39b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+# Treat all files in the Go repo as binary, with no git magic updating
+# line endings. Windows users contributing to Go will need to use a
+# modern version of git and editors capable of LF line endings.
+#
+# We'll prevent accidental CRLF line endings from entering the repo
+# via the git-review gofmt checks.
+#
+# See golang.org/issue/9281
+
+* -text
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..7b63aaf3d4d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,53 @@
+.DS_Store
+*.[5689ao]
+*.a[5689o]
+*.so
+*.pyc
+._*
+.nfs.*
+[5689a].out
+*~
+*.orig
+*.rej
+*.exe
+.*.swp
+core
+*.cgo*.go
+*.cgo*.c
+_cgo_*
+_obj
+_test
+_testmain.go
+build.out
+test.out
+doc/articles/wiki/*.bin
+include/plan9/libc_plan9.h
+misc/cgo/life/run.out
+misc/cgo/stdio/run.out
+misc/cgo/testso/main
+misc/dashboard/builder/builder
+src/cmd/?a/y.output
+src/liblink/anames?.c
+src/cmd/cc/y.output
+src/cmd/cgo/zdefaultcc.go
+src/cmd/dist/dist.dSYM
+src/cmd/gc/mkbuiltin1
+src/cmd/gc/opnames.h
+src/cmd/gc/y.output
+src/cmd/go/zdefaultcc.go
+src/go/doc/headscan
+src/runtime/mkversion
+src/runtime/zaexperiment.h
+src/runtime/zversion.go
+src/unicode/maketables
+src/*.*/
+test/pass.out
+test/run.out
+test/times.out
+test/garbage/*.out
+goinstall.log
+last-change
+VERSION.cache
+
+bin/
+pkg/