merge
This commit is contained in:
parent
1882d431f7
commit
d36ab2e093
1 changed files with 5 additions and 0 deletions
|
|
@ -134,6 +134,11 @@ Create release branch:
|
||||||
git push origin release-4.2
|
git push origin release-4.2
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Merge a branch back:
|
||||||
|
```
|
||||||
|
git merge --no-ff release-4.2
|
||||||
|
```
|
||||||
|
|
||||||
## Use of constants etc
|
## Use of constants etc
|
||||||
|
|
||||||
Use MAXPATHLEN (not PATH_MAX)
|
Use MAXPATHLEN (not PATH_MAX)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue