Rebasing Wireguard's master branch

Rebasing Wireguard's master branch

[Baptiste Jonglez]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

Hi Jason,

Could you please stop rebasing the master branch of the git repository?
It's really annoying (and possibly confusing) to obtain merge conflicts
while simply pulling the latest changes.

If you want to rebase, please use feature branches or something similar.

Thanks,
Baptiste

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Rebasing Wireguard's master branch

[Baptiste Jonglez]

[-- Attachment #1: Type: text/plain, Size: 3728 bytes --]

On Sat, May 13, 2017 at 09:10:40AM +0200, Baptiste Jonglez wrote:
> Hi Jason,
> 
> Could you please stop rebasing the master branch of the git repository?
> It's really annoying (and possibly confusing) to obtain merge conflicts
> while simply pulling the latest changes.

There you go again: lots of git conflicts when just pulling from the
master branch :(  Could you stop rebasing master like this?  Just use a
separate branch that you can rebase at will, and then merge in master only
when you put out a new release.

The branch on the right is the old master of my local repository, and the
branch on the left is the new master:

* cf757b7 - (origin/master, origin/HEAD) haskell: re-add updated haskell example (2 days ago) <Jason A. Donenfeld>
* 1aaa817 - (tag: 0.0.20170613) version: bump snapshot (3 days ago) <Jason A. Donenfeld>
...
* d58b525 - (tag: 0.0.20170517) version: bump snapshot (4 weeks ago) <Jason A. Donenfeld>
* c51728e - tools: opt-in globally to GNU-isms to keep the BSDs happy (4 weeks ago) <Jason A. Donenfeld>
* 2823e01 - tools: support text-based ipc (4 weeks ago) <Jason A. Donenfeld>
* 5c6d7d9 - tools: check for proto error on set too (4 weeks ago) <Jason A. Donenfeld>
* 2352dd4 - Kbuild: optimize debug builds too (4 weeks ago) <Jason A. Donenfeld>
* 523f15c - tests: check for stats counter increases (4 weeks ago) <Jason A. Donenfeld>
* 5d1e99e - qemu: new location for test kernels (4 weeks ago) <Jason A. Donenfeld>
* d6c2d79 - tools: stricter key file reading (4 weeks ago) <Jason A. Donenfeld>
* 80d8433 - jerry-rig: symlinks are better for tree patching (4 weeks ago) <Jason A. Donenfeld>
* dc34c6f - noise: redesign preshared key mode (4 weeks ago) <Jason A. Donenfeld>
* 2a3b0d2 - chacha20poly1305: implement vectorized hchacha20 (4 weeks ago) <Jason A. Donenfeld>
* f92f8a4 - qemu: new packages and better debugging (4 weeks ago) <Jason A. Donenfeld>
* 64c45d3 - tools: wg-quick: auto MTU discovery (4 weeks ago) <Jason A. Donenfeld>
* 1885707 - tools: retry name resolution on temporary failure (4 weeks ago) <Jason A. Donenfeld>
* 3867408 - compat: remember to call iptunnel_xmit_stats (4 weeks ago) <Jason A. Donenfeld>
* 42bc9b3 - compat: use real crypto_memneq (4 weeks ago) <Jason A. Donenfeld>
* 63ec3df - compat: work around ubnt offloading (4 weeks ago) <Jason A. Donenfeld>
| * 4858758 - (HEAD -> master) tests: check for stats counter increases (5 weeks ago) <Jason A. Donenfeld>
| * 4c294b7 - compat: remember to call iptunnel_xmit_stats (5 weeks ago) <Jason A. Donenfeld>
| * 778c7da - qemu: new location for test kernels (5 weeks ago) <Jason A. Donenfeld>
| * c9dd87b - tools: stricter key file reading (5 weeks ago) <Jason A. Donenfeld>
| * 1f9f7a3 - jerry-rig: symlinks are better for tree patching (5 weeks ago) <Jason A. Donenfeld>
| * 51df472 - noise: redesign preshared key mode (5 weeks ago) <Jason A. Donenfeld>
| * eccb09e - chacha20poly1305: implement vectorized hchacha20 (5 weeks ago) <Jason A. Donenfeld>
| * fe78c4a - qemu: new packages and better debugging (5 weeks ago) <Jason A. Donenfeld>
| * 3c7eca7 - tools: wg-quick: auto MTU discovery (5 weeks ago) <Jason A. Donenfeld>
| * f5bce1d - tools: retry name resolution on temporary failure (5 weeks ago) <Jason A. Donenfeld>
| * a5b3628 - compat: work around ubnt offloading (5 weeks ago) <Jason A. Donenfeld>
| * a043a75 - compat: use real crypto_memneq (5 weeks ago) <Jason A. Donenfeld>
|/
* 03406a9 - compat: ssse3 support (6 weeks ago) <Jason A. Donenfeld>
* 1370d96 - compat: use existing iptunnel_xmit function for stats (8 weeks ago) <Jason A. Donenfeld>
* 61e51e6 - (tag: 0.0.20170421) version: bump snapshot (8 weeks ago) <Jason A. Donenfeld>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: Rebasing Wireguard's master branch

[Jason A. Donenfeld]

You might prefer this sequence:

$ git fetch
$ git reset --hard origin/master