]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 935052a c30ffce)
Merge pull request #15210 from ssahani/networkctl-up-down
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 2 Apr 2020 08:43:53 +0000 (10:43 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 2 Apr 2020 09:21:25 +0000 (11:21 +0200)
Merging by hand because github refuses merging because "Rebasing the commits of
this branch on top of the base branch cannot be performed automatically as this
would create a different result than a regular merge.".

1  2 
src/network/networkctl.c patch | diff1 | diff2 | blob | history

diff --cc src/network/networkctl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.