oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Organized README to be a bit less confusing

Browse source
This commit is contained in:
Woody Gilk 2008-12-09 23:06:24 -06:00
parent f588a1a683
commit 1287c13084
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
README.markdown
View file

@ -2,23 +2,31 @@
This is the current development version of [Kohana](http://kohanaphp.com/).
## Forking, Merging, and Tracking Origin
## Distributed Source Control Management
With git, there is no central repository. In order to keep your local fork in sync with "origin",
you will to set up the main repository as a remote:
Unlike SVN, git does not used a central repository. This is why git is "distributed" and SVN is
"centralized". Although this makes git an extremely powerful system for collaborators, tracking
changes between various collaborators can quickly become difficult as multiple forks are created.
### Managing Remote Repositories
First, you will need to tell git about the remote repository:
git remote add shadowhand git://github.com/shadowhand/kohana.git
This adds "shadowhand" as a remote repository that can be pulled from. (Only do this once!)
This adds "shadowhand" as a remote repository that can be pulled from.
git checkout -b shadowhand/master
This creates a local branch "shadowhand/master" of the master branch of the "shadowhand" respository.
(Only do this once!)
This creates a local branch "shadowhand/master" of the master branch of the "shadowhand" repository.
### Merging Changes from Remote Repositories
Now that you have a remote repository, you can pull changes into your local repository:
git checkout shadowhand/master
This switches to your new "shadowhand/master" branch.
This switches to the previously created "shadowhand/master" branch.
git pull shadowhand master