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/03/06 14:02] – [Push Without Merge Commit] pull with rebase to avoid merge commit 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 71: | Line 80: | ||
To avoid a 'merge commit' | To avoid a 'merge commit' | ||
- | $ git pull --rebase | + | $ git pull --rebase |
Then push your changes. | Then push your changes. | ||
+ | ==== ' | ||
+ | |||
+ | 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 ===== | ||