diff --git a/etc/gitconfig b/etc/gitconfig
index 7b2c7aa7..49ea1fd1 100644
--- a/etc/gitconfig
+++ b/etc/gitconfig
@@ -1,22 +1,30 @@
 [core]
 	symlinks = false
 	autocrlf = true
+	excludesfile = /etc/gitignore
+
 [color]
 	diff = auto
 	status = auto
 	branch = auto
 	interactive = true
+	ui = true
+
 [pack]
 	packSizeLimit = 2g
+
 [help]
 	format = html
+
 [http]
 	sslCAinfo = /mingw/bin/curl-ca-bundle.crt
+
 [sendemail]
 	smtpserver = /mingw/bin/msmtp.exe
 
 [diff "astextplain"]
 	textconv = astextplain
+
 [rebase]
 	autosquash = true
 
diff --git a/etc/gitignore b/etc/gitignore
new file mode 100644
index 00000000..8458a6f7
--- /dev/null
+++ b/etc/gitignore
@@ -0,0 +1,159 @@
+
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/**
+tmp/**
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder 
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db 
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
diff --git a/share/WinGit/copy-files.sh b/share/WinGit/copy-files.sh
index 1b488549..892bebb7 100755
--- a/share/WinGit/copy-files.sh
+++ b/share/WinGit/copy-files.sh
@@ -90,6 +90,7 @@ cp $MSYSGITROOT/etc/termcap etc/ &&
 cp $MSYSGITROOT/etc/inputrc etc/ &&
 sed 's/ = \/mingw\// = \//' < $MSYSGITROOT/etc/gitconfig > etc/gitconfig &&
 cp $MSYSGITROOT/etc/gitattributes etc/ &&
+cp $MSYSGITROOT/etc/gitignore etc/ &&
 cp $MSYSGITROOT/share/WinGit/Git\ Bash.vbs . &&
 mkdir git-cheetah &&
 cp $MSYSGITROOT/src/git-cheetah/explorer/git_shell_ext.dll git-cheetah/ &&