Wireshark mailing list archives

Re: Migrate to GitLab?


From: Tomasz Moń <desowin () gmail com>
Date: Tue, 8 Oct 2019 10:32:49 +0200

On Tue, Oct 8, 2019 at 12:34 AM Guy Harris <guy () alum mit edu> wrote:
2) Will this cause merge commits, such as the crap that GitHub dumps in there by default:

        https://github.com/the-tcpdump-group/libpcap/commit/b43fdf882a3bd71391535362b3bf560ec54e77ef

to pollute the history?

In GitHub project settings you can select the Merge Button options:
* Allow merge commits - Add all commits from the head branch to the
base branch with a merge commit.
* Allow squash merging - Combine all commits from the head branch into
a single commit in the base branch.
* Allow rebase merging - Add all commits from the head branch onto the
base branch individually.

If you want to avoid the merge commits on GitHub you can untick the
"Allow merge commits".
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe

Current thread: