Scribd
Upload
118 views1 page

Nesto Posebno

This document contains configuration settings for git that set default behaviors for line endings, diffing code files, merging project and solution files, and treating common file types like images and documents as binary or text for diffing purposes. It provides comments explaining the purpose and effect of each setting.

Uploaded by

grisinny
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as TXT, PDF, TXT or read online on Scribd
118 views1 page

Nesto Posebno

This document contains configuration settings for git that set default behaviors for line endings, diffing code files, merging project and solution files, and treating common file types like images and documents as binary or text for diffing purposes. It provides comments explaining the purpose and effect of each setting.

Uploaded by

grisinny
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as TXT, PDF, TXT or read online on Scribd
You are on page 1/ 1

###############################################################################

# Set default behavior to automatically normalize line endings.


###############################################################################
* text=auto
###############################################################################
# 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
<html>
<body>
</body>
</html>
###############################################################################
# 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.
###############################################################################

You might also like