pokkiff@lemmy.sdf.orgtoEmacs@communick.news•Magit: How do you do "git pull --no-rebase"?English
1·
1 year 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.
I know this is self hosting, but I would probably just drop them in a S3 bucket with static hosting enabled and be done with it. Never have to worry about availability or big transfers eating up your upload at home. Probably wouldn’t cost more than a dollar a month.