This commit is contained in:
Andrei Astafev 2020-04-18 12:20:24 +03:00
parent 6f40948cef
commit f649a7a136
2 changed files with 216 additions and 90 deletions

35
config
View File

@ -100,8 +100,26 @@
track = update-index --no-assume-unchanged track = update-index --no-assume-unchanged
ls-untrack = !git ls-files -v | grep '^h' ls-untrack = !git ls-files -v | grep '^h'
# revert = checkout -- rm-submodule = " git rm --cached $1 && \
rm -rf $1 && \
rm -rf .git/modules/$1 && \
git config -f .gitmodules --remove-section submodule.$1 && \
git config -f .git/config --remove-section submodule.$1 "
[diff]
renames = copy
[log]
decorate = full
[push]
default = simple
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[color] [color]
diff = true diff = true
@ -126,18 +144,3 @@
changed = green changed = green
untracked = cyan untracked = cyan
[diff]
renames = copy
[log]
decorate = full
[push]
default = simple
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process

149
ignore
View File

@ -1,20 +1,154 @@
###
### Общие настройки для C, C++, Fortran, Qt, CMake, Ninja, LaTeX и редакторов
###
###
### Временные файлы текстовых редакторов
###
*.bak
*.gho
*.tmp
###
### LyX
###
*.lyx~
*.lyx#
###
### Vim
###
# Swap
[._]*.s[a-v][a-z]
!*.svg # comment out if you don't need vector files
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Temporary
.netrwhist
*~
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~
###
### C++
###
# Prerequisites
*.d
# Compiled Object files # Compiled Object files
*.slo *.slo
*.lo *.lo
*.o *.o
*.pyc *.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries # Compiled Dynamic libraries
*.so *.so
*.so.*
*.dylib *.dylib
*.dll *.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries # Compiled Static libraries
*.lai *.lai
*.la *.la
*.a *.a
*.lib
# Latex # Executables
*.exe
*.out
*.app
###
### CMake
###
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
###
### Ninja
###
.ninja_deps
.ninja_log
###
### GCC coverage testing tool files
###
*.gcno
*.gcda
*.gcov
###
### Qt
###
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*
*.qm
*.prl
# Qt unit tests
target_wrapper.*
# QtCreator
*.autosave
# QtCreator Qml
*.qmlproject.user
*.qmlproject.user.*
# QtCreator local machine specific files for imported projects
*creator.user*
*_qmlcache.qrc
###
### Latex
###
*.acn *.acn
*.acr *.acr
*.alg *.alg
@ -48,14 +182,3 @@
*.xdy *.xdy
*.tdo *.tdo
# Qt
*.pro.user
*.pro.user.*
moc_*.cpp
qrc_*.cpp
*-build-*
# gcc coverage testing tool files
*.gcno
*.gcda
*.gcov