Path: csiph.com!goblin3!goblin2!goblin1!goblin.stu.neva.ru!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Vincent Bernat Newsgroups: linux.debian.maint.python Subject: Re: git-dpm: remove a patch Date: Wed, 05 Jul 2017 16:50:02 +0200 Message-ID: References: X-Mailbox-Line: From debian-python-request@lists.debian.org Wed Jul 5 14:48:24 2017 Old-Return-Path: X-Amavis-Spam-Status: No, score=-11.88 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -5 Organization: Debian Mail-Followup-To: debian-python@lists.debian.org User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Mailing-List: archive/latest/14992 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/87o9szaqjg.fsf@luffy.cx Approved: robomod@news.nic.it Lines: 41 Sender: robomod@news.nic.it X-Original-Date: Wed, 05 Jul 2017 16:48:03 +0200 X-Original-Message-ID: <87o9szaqjg.fsf@luffy.cx> X-Original-References: <874lur15tz.fsf@vostro.rath.org> Xref: csiph.com linux.debian.maint.python:9614 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable =E2=9D=A6 5 juillet 2017 13:27 +0200, Nikolaus Rath = =C2=A0: >> How to remove a patch with git-dpm? > > Look for "Removing existing patches" in git-dpm(1): > > $ git-dpm checkout-patched > $ git rebase -i upstream-unstable > $ git-dpm dch -- -i That's totally similar to use "git reset --hard HEAD~1" (since I want to remove the last commit). =2D-=20 Make sure all variables are initialised before use. - The Elements of Programming Style (Kernighan & Plauger) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEErvI0h2bzccaJpzYAlaQv6DU1JfkFAllc/CMACgkQlaQv6DU1 JfkeJQ/9F3W6/M+xTdctUCfgHn+mTlL/fy20yvKqBBt/Evo5n+A/IRP6S4Eagp+w Rl95sYfo0YImA+quaZuBce3BIKs3Powl9ribWNbXYRR7u7+esJrHvo9Ny+nlM63F HneYSfOKnI648ZZEpXaYcvuBJ+SjReyn/wF4ByjA/5+gZXXmaRXxXK7Xhr/+Ji6h HD3EknuBZRzVb7OKpwiEYCzryyK/h95LjDxo/k8IH/GXE6xYos7bD9bs3cTsQNaY ixwqzoZ04KLuUKPKu/HJindDRb7w4z6QnHq6yM8UhpRV4NfzRnvfhqehVBKqeYOC P4zES53k/d6lmhYKwjFw2MGJawCUIx+qWjsTSF710+7uPIQ0b5a3m/lguHPnygUR W+8IU0CEZyNGHpkHfB57bnHxc75N95KvQLsJPi/WI8SPBy9L0/In/1u1Yh4ulYit Af6ngm/YYjNWXzNouyGnLEA1cmRc8CTYMisbDbY6E4i2TFCRR9sS9E3wLhb4mOQr NYIpNwb8Jz++969q+yw2xLlF3u868YpKF1lT1pfeQfUy+BVwyTBozF5Lp6Xpt1pr ZuUWawCEYWlpGjndXPRzuWU3k7mliMqJikLLZu3ocBsbNAWvfCSIULAlqzw5mECx aWVYfzWzbE3yMX32SvpGnjx3mFg9OAX/dWrbifKk0Sr7qI+PW/s= =f6GW -----END PGP SIGNATURE----- --=-=-=--