Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
howto:git [2021/02/22 13:26] – Remove references to USE_DOSEMU (no longer used). digital man | howto:git [2022/10/19 20:31] – [Merge Upstream Changes into Your Branch] Need merge from remote tracking 'master' branch digital man | ||
---|---|---|---|
Line 32: | Line 32: | ||
* https:// | * https:// | ||
+ | ==== Branches ==== | ||
+ | |||
+ | The '' | ||
+ | |||
+ | $ git checkout dailybuild_linux-x64 | ||
+ | |||
+ | If you wish to switch back to the '' | ||
+ | |||
+ | $ git checkout master | ||
==== Read-only Directories ==== | ==== Read-only Directories ==== | ||
Line 55: | Line 64: | ||
$ git pull | $ git pull | ||
- | $ git merge master | + | $ git merge origin/master |
===== Push Without Merge Commit ===== | ===== Push Without Merge Commit ===== | ||
Line 69: | Line 78: | ||
hint: See the 'Note about fast-forwards' | hint: See the 'Note about fast-forwards' | ||
- | To avoid a 'merge commit' | + | To avoid a 'merge commit' |
- | $ git reset --soft HEAD~1 | + | $ git pull --rebase --autostash |
- | $ git pull | + | |
- | | + | Then push your changes. |
- | Then re-add/ | + | |
+ | ==== ' | ||
+ | To create a convenient alias for the '' | ||
+ | $ git config --global alias.up "pull --rebase --autostash" | ||
+ | Now you can just run '' | ||
===== Push Without Password ===== | ===== Push Without Password ===== | ||