mirror of
https://github.com/stefanprodan/dockprom.git
synced 2025-05-05 15:32:50 +00:00
48a37afdc2
When cloning the repository from scratch, 4 files are coming up as modified and attempting to run `checkout` to get to a clean state fails due to the rule in this file setting all files (`*`) to be processed by Git as `text` with automatic EOL processing. See the below for what happens: ``` davidalger:05:13 PM:/server/proj$ git clone https://github.com/stefanprodan/dockprom Cloning into 'dockprom'... remote: Enumerating objects: 605, done. remote: Total 605 (delta 0), reused 0 (delta 0), pack-reused 605 Receiving objects: 100% (605/605), 1.49 MiB | 328.00 KiB/s, done. Resolving deltas: 100% (343/343), done. davidalger:05:14 PM:/server/proj$ cd dockprom/ warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: screens/Grafana_Docker_Containers.png modified: screens/Grafana_Docker_Host.png modified: screens/Grafana_Prometheus.png modified: screens/Slack_Notifications.png no changes added to commit (use "git add" and/or "git commit -a") warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ git checkout . Updated 4 paths from the index warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: screens/Grafana_Docker_Containers.png modified: screens/Grafana_Docker_Host.png modified: screens/Grafana_Prometheus.png modified: screens/Slack_Notifications.png no changes added to commit (use "git add" and/or "git commit -a") warning: CRLF will be replaced by LF in screens/Grafana_Docker_Containers.png. The file will have its original line endings in your working directory davidalger:05:14 PM:/server/proj/dockprom (master *) $ vi .gitattributes davidalger:05:14 PM:/server/proj/dockprom (master *) $ git checkout screens/ Updated 4 paths from the index davidalger:05:14 PM:/server/proj/dockprom (master *) $ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: .gitattributes no changes added to commit (use "git add" and/or "git commit -a") davidalger:05:14 PM:/server/proj/dockprom (master *) $ ```
64 lines
2.5 KiB
Plaintext
64 lines
2.5 KiB
Plaintext
###############################################################################
|
|
# Set default behavior to automatically normalize line endings.
|
|
###############################################################################
|
|
* text eol=lf
|
|
|
|
###############################################################################
|
|
# Set default behavior for command prompt diff.
|
|
#
|
|
# This is need for earlier builds of msysgit that does not have it on by
|
|
# default for csharp files.
|
|
# Note: This is only used by command line
|
|
###############################################################################
|
|
#*.cs diff=csharp
|
|
|
|
###############################################################################
|
|
# Set the merge driver for project and solution files
|
|
#
|
|
# Merging from the command prompt will add diff markers to the files if there
|
|
# are conflicts (Merging from VS is not affected by the settings below, in VS
|
|
# the diff markers are never inserted). Diff markers may cause the following
|
|
# file extensions to fail to load in VS. An alternative would be to treat
|
|
# these files as binary and thus will always conflict and require user
|
|
# intervention with every merge. To do so, just uncomment the entries below
|
|
###############################################################################
|
|
#*.sln merge=binary
|
|
#*.csproj merge=binary
|
|
#*.vbproj merge=binary
|
|
#*.vcxproj merge=binary
|
|
#*.vcproj merge=binary
|
|
#*.dbproj merge=binary
|
|
#*.fsproj merge=binary
|
|
#*.lsproj merge=binary
|
|
#*.wixproj merge=binary
|
|
#*.modelproj merge=binary
|
|
#*.sqlproj merge=binary
|
|
#*.wwaproj merge=binary
|
|
|
|
###############################################################################
|
|
# behavior for image files
|
|
#
|
|
# image files are treated as binary by default.
|
|
###############################################################################
|
|
*.jpg binary
|
|
*.png binary
|
|
*.gif binary
|
|
|
|
###############################################################################
|
|
# diff behavior for common document formats
|
|
#
|
|
# Convert binary document formats to text before diffing them. This feature
|
|
# is only available from the command line. Turn it on by uncommenting the
|
|
# entries below.
|
|
###############################################################################
|
|
#*.doc diff=astextplain
|
|
#*.DOC diff=astextplain
|
|
#*.docx diff=astextplain
|
|
#*.DOCX diff=astextplain
|
|
#*.dot diff=astextplain
|
|
#*.DOT diff=astextplain
|
|
#*.pdf diff=astextplain
|
|
#*.PDF diff=astextplain
|
|
#*.rtf diff=astextplain
|
|
#*.RTF diff=astextplain
|