Rashaad Essop skopp
| diff -u jekyll-1.1.2/lib/jekyll/command.rb.orig jekyll-1.1.2/lib/jekyll/command.rb | |
| --- jekyll-1.1.2/lib/jekyll/command.rb.orig 2013-08-26 11:31:03 +0900 | |
| +++ jekyll-1.1.2/lib/jekyll/command.rb 2013-08-26 11:31:06 +0900 | |
| @@ -15,7 +15,9 @@ | |
| # | |
| # Returns nothing | |
| def self.process_site(site) | |
| - site.process | |
| + t = Time.now | |
| + num = site.process |
Merge vs. Rebase – A deep dive into the mysteries of revision control
Posted on March 7, 2009, 03:51, by dsp, under Open Source, Version Control. I remember the days when I started learning Git about two years ago. I crawled through all the available commands and read the man pages what they are for and I remember when I stumbled over rebase and stuck. After figuring out what it actually does, I start loving it, but didn’t understand it’s dangerousness until someday I somehow got duplicated commits after pulling from another repository. So let me explain what goes wrong and why merge and rebase are often misunderstood. I’ll also present a list of golden-rules about their usage. Before we start with explaining both commands, I would like to give you one of the most important rules, in case you don’t want to read the complete article.
Never rebase branches or trees that you pulled. Only rebase local branches.
Disclaimer: I never read this article myself
| fusspawn@vm-6:~$ df -h | |
| Filesystem Size Used Avail Use% Mounted on | |
| aufs 1.2G 606M 484M 56% / | |
| none 4.0K 0 4.0K 0% /sys/fs/cgroup | |
| none 6.8G 48K 6.8G 1% /run | |
| none 5.0M 0 5.0M 0% /run/lock | |
| none 34G 0 34G 0% /run/shm | |
| none 100M 0 100M 0% /run/user | |
| fusspawn@vm-6:~$ dd if=/dev/urandom of=/run/shm/randjunk bs=1M count=2048 | |
| 2048+0 records in |
| DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | |
| Version 2, December 2004 | |
| Copyright (C) 2011 YOUR_NAME_HERE <YOUR_URL_HERE> | |
| Everyone is permitted to copy and distribute verbatim or modified | |
| copies of this license document, and changing it is allowed as long | |
| as the name is changed. | |
| DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE |
| https://twitter.com/getify/status/335224712810598401 |
Hello there! This is a sample post for gist.io, a super-lightweight writing soapbox for hackers.
Now look up. Further. Above the post title. See that grey text with the gist ID?
Now back to me. That grey text is a link! Open that sucker in a new tab to see the source for this post. Also, I'm on a horse.
If you peek at it with a web inspector, you'll see that it is a second-level heading. You can use first level headings, but they'll look just like the second level ones, and the gods of the HTML5 outlining algorithm will frown upon you.
CSS Working Group Specifications
To download a copy of all specifications:
hg clone https://dvcs.w3.org/hg/csswg
For help using or setting up Mercurial see instructions here. Specification issues are discussed on the public www-style mailing list.