From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Enge Subject: Re: =?utf-8?B?4oCYY29yZS11cGRhdGVz?= =?utf-8?B?4oCZ?= merge is a squashed commit Date: Thu, 4 Aug 2016 20:32:42 +0200 Message-ID: <20160804183242.GA19115@solar> References: <20160803211032.GA6034@jasmine> <87a8gtyntw.fsf@netris.org> <20160804082400.GA1638@solar> <87ziosyalv.fsf@netris.org> <20160804124032.GA5789@solar> <20160804130409.GB6326@jasmine> <87vazgy8ex.fsf@netris.org> <20160804141016.GA6889@solar> <87vazgegnv.fsf@gnu.org> <20160804163707.GA8137@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVNRu-0004wp-1b for guix-devel@gnu.org; Thu, 04 Aug 2016 14:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVNRn-00046v-Sy for guix-devel@gnu.org; Thu, 04 Aug 2016 14:32:52 -0400 Received: from mailrelay1.public.one.com ([91.198.169.124]:31943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVNRn-00046Y-F6 for guix-devel@gnu.org; Thu, 04 Aug 2016 14:32:47 -0400 Content-Disposition: inline In-Reply-To: <20160804163707.GA8137@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org On Thu, Aug 04, 2016 at 12:37:07PM -0400, Leo Famulari wrote: > And if you don't want to sign every commit as you work (it can be > tedious if your gpg-agent has a short cache lifetime), you can use > git-rebase to sign a commit range before pushing, as in this shell > script: > > git-sign () { > case $# in > ("0") range=HEAD ;; > ("1") range=$1 ;; > (*) echo "too many arguments" >&2; return 1 ;; > esac > > git rebase "$range" --exec "git commit --amend --no-edit --gpg-sign" || git rebase --abort > } > > So, if I have 4 commits to push, I do `git-sign HEAD~4`. So it is not enough to just do a git rebase -S ? I thought this would re-sign all my commits on top of the base of the rebase. If not, this could explain my earlier mistake... Andreas