Re: [Wget-dev] wget2 | Handle wide characters in download progress bar. (!407)

[Tim Rühsen]

@jmoellers I see 7 commits, the latest just has an updated description. I 
normally use `gitk --all` to see if a branch is merged / rebase.

Make sure you are on your branch `issue-375` (e.g. with `git checkout 
issue-375`).

In your case you want to merge all 7 commits into one commit. You do so with 
`git rebase -i HEAD~7`. Now your editor opens up and shows all 7 commits, line 
by line. The latest is in the first line. Now replace 'pick' in lines 2-7 by 
'f' (=fixup). Then save and exit. Check with `gitk` that you now have just one 
commit.

Now rebase to upstream's master and update your MR:
1. if you don't already have our 'upstream' repository as a remote: `git remote 
add upstream https://gitlab.com/gnuwget/wget2.git`
2. Update your local upstream copy via `git fetch upstream`
3. Now rebase onto upstream/master: `git rebase upstream/master`
4. Update the branch on Gitlab via `git push --force-with-lease`. The MR will 
automatically be updated.

-- 
Reply to this email directly or view it on GitLab: 
https://gitlab.com/gnuwget/wget2/merge_requests/407#note_111750310
You're receiving this email because of your account on gitlab.com.