rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-28 06:24:10 +01:00
Code Issues Releases Activity

.gitattributes: add a note how to renormalize old branches for merge

Browse Source
This commit is contained in:
Oleg Semyonov 2013-04-24 03:31:09 +03:00
parent 57ca1639cc
commit e2bcac4e21
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitattributes vendored
View File

@ -2,8 +2,11 @@
# Line endings normalization: http://wiki.openpilot.org/display/Doc/Coding+Style
# You need at least git 1.7.2 for this to work (previous versions ignore text and eol attributes).
#
# Make sure you have committed all local changes first. Then use the following bash commands
# to normalize your local repository to be able to merge it with a mainline:
# To merge your old branch with new normalized version use the following git option:
# git merge ... -X renormalize
#
# To reformat your local branch completely make sure you have committed all local changes first.
# Then use the following bash commands:
#
# Minimal normalization:
# git rm --cached -r .