pokkiff@lemmy.sdf.orgtoEmacs@communick.news•Magit: How do you do "git pull --no-rebase"?English
1·
11 months agoI avoid the need to do this by always keeping my local changes in a branch. Then I can pull master from the remote without any merging, rebase my branch, then merge the branch back into master in a fast forward. Keeps a clean stack of commits without any merges in the history.
Yes, this is absolutely a valid way to host a static site. I have done this specifically for several sites.