From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 344995135488 X-Google-Groups: supmua X-Google-Thread: 3030fda1bf,1711719559b2ece4 X-Google-Attributes: gid3030fda1bf,domainid0,public,googlegroup X-Google-NewGroupId: yes X-Received: by 10.194.109.131 with SMTP id hs3mr641757wjb.0.1416137099225; Sun, 16 Nov 2014 03:24:59 -0800 (PST) X-BeenThere: supmua@googlegroups.com Received: by 10.152.23.229 with SMTP id p5ls785709laf.4.gmail; Sun, 16 Nov 2014 03:24:58 -0800 (PST) X-Received: by 10.112.199.167 with SMTP id jl7mr1205096lbc.5.1416137098473; Sun, 16 Nov 2014 03:24:58 -0800 (PST) Return-Path: Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by gmr-mx.google.com with ESMTPS id sg7si1696515lbb.1.2014.11.16.03.24.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 16 Nov 2014 03:24:58 -0800 (PST) Received-SPF: none (google.com: eg@gaute.vetsj.com does not designate permitted sender hosts) client-ip=209.85.217.181; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: eg@gaute.vetsj.com does not designate permitted sender hosts) smtp.mail=eg@gaute.vetsj.com Received: by mail-lb0-f181.google.com with SMTP id l4so14603676lbv.26 for ; Sun, 16 Nov 2014 03:24:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:subject:to:cc:references:in-reply-to :user-agent:message-id:mime-version:content-type :content-transfer-encoding; bh=mIDkBrwe99ssO23t15brXGAwA2YzdyW+TgDTHKnhyNE=; b=kpeoWMfdLvUg66jO9sY94K8QLWzOEwHCkV3Zpil3ZmJUV9ByvWYk0wvbdA8uEesnDv YIa1ApEljCYveqsYgmKluW77evUiqKDSwLFPBC//kA3kbgTDqgnXm/AWDpwSxzBgJcQa h0Qhy9P4nWsYwERSFGHwGnmC1Mqv9BvSLU80s1kL9IPs+HWVvnKu1BYf50RqZsDyFwwo 5Xdj4Hm3qInVQ9GRijFREg2v57icm6eJoP5mVOlryY1LzaEsFbidMRCZfJdFbIvlm9ae 7QVqfRmf1IDvmrSHSYm/Ej3jR6vyedbx+T0LEhh0se+/bF0sqIzDx9ac1/5yTeOx5ZGa iv7A== X-Gm-Message-State: ALoCoQnkX2flMHxodvar7bVl9Ksvrm2MwF0nTx0T9Qr/8lc8W0O9ipnLg7YPIyPVYFNF7zTaa6wk X-Received: by 10.152.42.226 with SMTP id r2mr19387632lal.29.1416137098151; Sun, 16 Nov 2014 03:24:58 -0800 (PST) Return-Path: Received: from localhost (c2774BF51.dhcp.as2116.net. [81.191.116.39]) by mx.google.com with ESMTPSA id j6sm9558080lbs.9.2014.11.16.03.24.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Nov 2014 03:24:57 -0800 (PST) Date: Sun, 16 Nov 2014 11:25:05 +0000 From: Gaute Hope Subject: Re: [sup] [PATCH] added command line argument to sup invocation: "sup email-address" invokes sup in command line To: Ruthard Baudach Cc: supmua References: <1415471780-sup-1914@ruthard-lappi> <1415959463-astroid-0-4xu4dq0h0g-7223@strange> <1416045204-sup-6555@ruthard-lappi> In-Reply-To: <1416045204-sup-6555@ruthard-lappi> User-Agent: astroid/v18cf4a3b (https://github.com/gauteh/astroid) Message-Id: <1416136656-astroid-2-jue6bz7l86-1329@strange> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Excerpts from Ruthard Baudach's message of November 15, 2014 10:57: >>=3D=3D Ausz=C3=BCge aus der Nachricht von Gaute Hope vom 2014-11-14 11:1= 3: >> got a few comments below [btw: it is better to send a completely new >> patch with your changes squashed together than to send incremental >> changes to the first patch]. > I really found no way to do this, as far as I understood it, it's > intentional that format-patch preserves all commits by means of > incremental patches. I just re-cloned the repository. Here's my workflow in this case (very quickly jotted down): - say you have a 'compose-dev' branch with you changes based off 'develop' with incremental commits (the orignal patch, the refinements, etc) - (first make sure 'develop' is up-to-date: git checkout develop; git pull) - when you're ready to send a pull request or send the patches upstream: - make a new branch off compose-dev: $ git checkout compose-dev; git checko= ut -b compose-dev-polished - now we need to cleanup this one, also 'develop' might have changed since you started. so we need to rebase. use rebase -i (--interactive) against 'develop': git rebase -i develop - now git will start putting the commits on top of 'develop' as it is now, there migth be conflicts, resolve them. in the commit message file that pops up as part of the rebase you can choose to re-order, re-phrase and squash commits. I typically squash minor refinements, while if you make two distinct changes they should remain as two separate commits (you will then send both upstream). If you need to make further refinements later you can reset your dev branch to the polished one and keep working there: (git checkout compose-dev; git reset --hard compose-dev-polished <- careful, will delete any changes done in compose-dev). - gaute =