Skip to content

Instantly share code, notes, and snippets.

@klynton
Created May 29, 2013 20:20
Show Gist options
  • Save klynton/5673505 to your computer and use it in GitHub Desktop.
Save klynton/5673505 to your computer and use it in GitHub Desktop.
Line endings, man.
/Users/klynton/Library/Application Support/Sublime Text 3/Packages
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages → git clone https://github.com/titoBouzout/SideBarEnhancements.git "SideBarEnhancements"
Cloning into 'SideBarEnhancements'...
remote: Counting objects: 900, done.
remote: Compressing objects: 100% (364/364), done.
remote: Total 900 (delta 561), reused 863 (delta 531)
Receiving objects: 100% (900/900), 188.14 KiB, done.
Resolving deltas: 100% (561/561), done.
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages → cd "SideBarEnhancements"
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git checkout st3
error: Your local changes to the following files would be overwritten by checkout:
.gitignore
Please, commit your changes or stash them before you can switch branches.
Aborting
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git stash
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
Saved working directory and index state WIP on master: 5f7bf59 Update readme
HEAD is now at 5f7bf59 Update readme
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git checkout st3
error: Your local changes to the following files would be overwritten by checkout:
.gitignore
Please, commit your changes or stash them before you can switch branches.
Aborting
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git stash
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
Saved working directory and index state WIP on master: 5f7bf59 Update readme
HEAD is now at 5f7bf59 Update readme
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git checkout st3
error: Your local changes to the following files would be overwritten by checkout:
.gitignore
Please, commit your changes or stash them before you can switch branches.
Aborting
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git config --global core.autocrlf
input
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git config core.autocrlf
input
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git checkout st3
error: Your local changes to the following files would be overwritten by checkout:
.gitignore
Please, commit your changes or stash them before you can switch branches.
Aborting
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git add .gitignore
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master* → git commit -m"fuckin line endings"
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
[master c7bdb29] fuckin line endings
warning: CRLF will be replaced by LF in .gitignore.
The file will have its original line endings in your working directory.
1 file changed, 2 insertions(+), 2 deletions(-)
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;master → git checkout st3
Branch st3 set up to track remote branch st3 from origin.
Switched to a new branch 'st3'
klynton@Z0FL:~/Library/Application Support/Sublime Text 3/Packages/SideBarEnhancements;st3 →
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment