Merge pull request #1007 from AladW/fetch-discard
commitb9046964b848cc910c11824ec5f94385b537d57b
authorAlad Wenter <AladW@users.noreply.github.com>
Fri, 24 Jun 2022 18:48:26 +0000 (24 20:48 +0200)
committerGitHub <noreply@github.com>
Fri, 24 Jun 2022 18:48:26 +0000 (24 20:48 +0200)
treee1d1173e7c813ed7df0234fcae26a7b0527fd616
parentcc573cbc342f01b0ec7a2788e4de36a53aad01dc
parent853d6c41bd2ea0d536b02a51ab5755b082e57a3d
Merge pull request #1007 from AladW/fetch-discard

fetch: add --discard, run git-merge by default