Modify the .gitignore file to display the conflicting files of git apply or patch -px. Close #I3NNUS Change-Id: I0ca0e312d0a83326e661d997181167e61b63e4b4
26 lines
246 B
Plaintext
26 lines
246 B
Plaintext
# General ignored file types
|
|
*.o
|
|
*.a
|
|
*.so
|
|
*.swp
|
|
|
|
# IDE settings
|
|
.vscode
|
|
.idea
|
|
.settings
|
|
.cproject
|
|
.project
|
|
|
|
# VIM files
|
|
cscope*
|
|
tags
|
|
|
|
# Menuconfig temp files
|
|
/include/config
|
|
/include/generated
|
|
.config*
|
|
|
|
# Build temp files
|
|
/platform/board.ld
|
|
/out
|