[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Wget-dev] wget2 | Added Last-Modified: and Content-Type to --state-
|
From: |
Tim Rühsen |
|
Subject: |
Re: [Wget-dev] wget2 | Added Last-Modified: and Content-Type to --state-site output CSV (!388) |
|
Date: |
Fri, 19 Oct 2018 09:53:58 +0000 |
What @darnir means is the following procedure
- update your master branch to latest upstream (`git checkout master` + `git
pull --all --prune`)
- checkout your branch 'add_Last-Modified' (`git checkout add_Last-Modified`)
- squash/fixup your 4 commits into one:
- `git rebase -i HEAD~4`, then replace 'pick' by 'f' in lines 2-4 and save
the changes
- change the commit message (`git commit --amend`) to GNU style (I normally
open a second console and view the changes with `git diff`). Take other commit
messages as example how to format.
- rebase to master (`git rebase master`), fix possible merge conflicts.
- update the MR with `git push --force-with-lease` (--force-with-lease is more
secure than -f/--force).
--
Reply to this email directly or view it on GitLab:
https://gitlab.com/gnuwget/wget2/merge_requests/388#note_110198222
You're receiving this email because of your account on gitlab.com.