git
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revisionLast revisionBoth sides next revision | ||
| git [2023/07/04 14:29] – odefta | git [2023/11/03 10:26] – [Merge changes form master branch in current branch] odefta | ||
|---|---|---|---|
| Line 24: | Line 24: | ||
| ====== Disable https ssl verification ====== | ====== Disable https ssl verification ====== | ||
| - | git config --global http.sslVerify | + | git config --global http.sslVerify |
| + | |||
| + | ====== Sync fork with original repo ====== | ||
| + | < | ||
| + | git remote add upstream https:// | ||
| + | git stash | ||
| + | git checkout master | ||
| + | git fetch upstream | ||
| + | git rebase upstream/ | ||
| + | git stash pop | ||
| + | </ | ||
| + | |||
| + | ====== Merge changes form master branch in current branch ====== | ||
| + | |||
| + | < | ||
| + | git.exe merge remotes/ | ||
| + | </ | ||
| + | |||
| + | |||
| + | |||
| + | |||
git.txt · Last modified: 2023/11/28 23:35 by odefta