Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Add Prereq #288

Merged
merged 1 commit into from
Jan 24, 2016
Merged

Add Prereq #288

merged 1 commit into from
Jan 24, 2016

Conversation

Krutonium
Copy link
Contributor

Adds List of Prerequisites

@Krutonium
Copy link
Contributor Author

I think I am done with this, unless you want me to change anything else.


[Git](https://git-scm.com/download/win)

##OS X
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only list Windows for now since there is no information below that is useful.

@bbondy
Copy link
Member

bbondy commented Jan 24, 2016

Please squash all into one commit with git rebase -i master

@Krutonium
Copy link
Contributor Author

kk

@Krutonium
Copy link
Contributor Author

I have no idea how to use Vim, and googling offers nothing of help :X

Damnit Git...

@bbondy
Copy link
Member

bbondy commented Jan 24, 2016

git config core.editor notepad

@Krutonium
Copy link
Contributor Author

Notepad is also useless for this because of the wrong type of line ending... :/

Notepad++ seems to be a good bet, lets try to get it to use that...

Errored on (86) in program files :/

Lets keep trying...

@bbondy
Copy link
Member

bbondy commented Jan 24, 2016

You could do notepad++ which will handle that better I bet or something else.

@Krutonium
Copy link
Contributor Author

So I have it working with Notepad++, but I am not sure about how to actually tell it to squash. I've tried selecting the first commit and squashing everything, that didn't work. I've tried selecting the last commit and squashing everything, that didn't work but did tell me something about "allow-empty"... Help?

@bbondy
Copy link
Member

bbondy commented Jan 24, 2016

Check here, I think you want to keep the first and squash the others.
http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

@Krutonium
Copy link
Contributor Author

Finally! :D Did it!

@bbondy
Copy link
Member

bbondy commented Jan 24, 2016

\o/ Thanks for the cleanup and for helping future people get setup!

bbondy added a commit that referenced this pull request Jan 24, 2016
@bbondy bbondy merged commit 9ce97fe into brave:master Jan 24, 2016
@Krutonium
Copy link
Contributor Author

No problem, I just wish Vim wasn't so damn confusing... nano plz.

That and Git. Git should be a bit easier for that...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants