blob: 066d6ffb02722f2b5195a276d5a55120569e9d42 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
# Branching
## Basic
If you are new to Git, here are some of the resources you might find useful:
* [GitHub’s blog post](https://github.com/blog/120-new-to-git)
* <http://try.github.com/>
* <http://sixrevisions.com/resources/git-tutorials-beginners/>
* <http://rogerdudler.github.io/git-guide/>
## Getting the latest code from the FreshRSS repository
First you need to add the official repo to your remote repo list:
```sh
git remote add upstream git@github.com:FreshRSS/FreshRSS.git
```
You can verify the remote repo is successfully added by using:
```sh
git remote -v show
```
Now you can pull the latest development code:
```sh
git checkout edge
git pull upstream edge
```
## Starting a new development branch
```sh
git checkout -b my-development-branch
```
## Sending a patch
```sh
# Add the changed file, here actualize_script.php
git add app/actualize_script.php
# Commit the change and write a proper commit message
git commit
# Double check all looks well
git show
# Push it to your fork
git push
```
Now you can create a PR based on your branch.
## How to write a commit message
A commit message should succinctly describe the changes on the first line. For example:
> Fix broken icon
If necessary, this can be followed by a blank line and a longer explanation.
For further tips, see [here](https://chris.beams.io/posts/git-commit/).
|
