Changes to make forking easier and less conflicts

This commit is contained in:
Lim Chee Aun 2013-11-27 22:47:55 +08:00
parent e3dd1e9be6
commit 0f521fa2fd
4 changed files with 31 additions and 29 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
life.md

View File

@ -25,15 +25,30 @@ How to setup your own *Life*
---------------------------- ----------------------------
1. Fork this project. 1. Fork this project.
2. Edit `life.md`. 2. `git checkout -b gh-pages` (or any branch name you like)
3. Push to `gh-pages` branch and publish to [GitHub Pages](http://pages.github.com/). 3. Make a copy `life.example.md`, rename it to `life.md`.
4. Add your life events into `life.md`.
5. `git push origin gh-pages` and publish to [GitHub Pages](http://pages.github.com/).
Special datetime formats How to upgrade your *Life*
------------------------ --------------------------
- `2001-2005`, `10/2001-02/03/2005` - Within the two dates 1. `git checkout master`
- `~2005` - Around the time in that year 2. `git remote add cheeaun https://github.com/cheeaun/life.git`
- `2005-~` - From that year and beyond (now). 3. `git fetch cheeaun` and `git merge cheeaun/master` to upgrade to latest Life.
4. `git checkout gh-pages` and `git merge master` to sync changes back to GitHub Pages.
[Learn more](https://help.github.com/articles/fork-a-repo).
Datetime "syntax"
-----------------
- `2000` - event that happen in that year
- `01/2000` - event that happen in that month/year
- `01/01/2000` - event that happen exactly in that date/month/year
- `2001-2005`, `10/2001-02/03/2005` - event that happen within the two dates
- `~2005` - event that happen around the time in that year
- `2005-~` - event that happen from that year and beyond (now).
License License
------- -------

8
life.example.md Normal file
View File

@ -0,0 +1,8 @@
@USERNAME' life
===============
- 24/02/1955 Born
- ~1968 Summer job
- 03/1976 Built a computer
- 01/04/1976 Started a company
- 04/1976-2011 Whole bunch of interesting events

22
life.md
View File

@ -1,22 +0,0 @@
@cheeaun's life
===============
- 20/06/1985 Born
- 1991 Kindergarten
- 1992-1997 Primary school - SKSJ
- 1998-2000 Secondary school - SMKTI
- ~2000 First computer
- 2001-2002 Secondary school - SMKDOB
- 04/11/2002 Phoenity is born
- 2003-2004 Secondary school (Form 6) - SMKDOB
- 01/2005-03/2005 First (non-technical) job
- 08/2005-08/2008 University - UTAR
- 11/2005 Dead hard drive of first computer
- 07/2006-05/2007 CSS Web Designer - MindValley
- 18/12/2006 First tweet
- 04/2007 First laptop (HP)
- 06/2008-07/2009 Web Developer - ZoeCity
- 24/08/2009-26/06/2013 Front-End Developer - Wego
- 07/2010 Second laptop (Dell)
- 04/03/2012 HackerWeb featured on Hacker News' front page
- 01/07/2013-~ Software Engineer - Viki