|
|
@@ -48,7 +48,7 @@ If you want to contribute to Worg, keep reading.
|
|
|
|
|
|
If you already have your local clone of Worg obtained via http
|
|
|
protocol, you can easily tell your git to remain using =http= for
|
|
|
- fetching and =git= for pushing, by adding to your ~/.gitconfig:
|
|
|
+ fetching and =git= for pushing, by adding to your =~/.gitconfig=:
|
|
|
|
|
|
: [url "git://worg@orgmode.org:worg.git"]
|
|
|
: pushInsteadOf = http://repo.or.cz/r/
|
|
|
@@ -109,7 +109,7 @@ agenda view.
|
|
|
** Register your changes under your name
|
|
|
|
|
|
Information regarding your name can be stored in your global
|
|
|
-~/.gitconfig file, or in Worg/.git/config
|
|
|
+=~/.gitconfig= file, or in =Worg/.git/config=.
|
|
|
|
|
|
Edit it like this:
|
|
|
|
|
|
@@ -126,7 +126,7 @@ Now your changes will be filed under your name.
|
|
|
It's good practice to pull the current version of the repository before
|
|
|
making your own additions. But even if you do, someone might make a change
|
|
|
while you are working. So it will often be necessary to pull immediately
|
|
|
-before pushing your new commit. In this situation, if you use 'git pull'
|
|
|
+before pushing your new commit. In this situation, if you use =git pull=
|
|
|
directly, then a 'merge commit' will be generated, looking like this:
|
|
|
|
|
|
#+begin_example
|
Julian Gehring