From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: =?utf-8?B?4oCYY29yZS11cGRhdGVz?= =?utf-8?B?4oCZ?= merge is a squashed commit Date: Thu, 4 Aug 2016 12:37:07 -0400 Message-ID: <20160804163707.GA8137@jasmine> References: <87wpjxy4ta.fsf_-_@gnu.org> <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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVLev-0006Wc-Nc for guix-devel@gnu.org; Thu, 04 Aug 2016 12:38:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVLeq-0001n5-IK for guix-devel@gnu.org; Thu, 04 Aug 2016 12:38:13 -0400 Content-Disposition: inline In-Reply-To: <87vazgegnv.fsf@gnu.org> 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: Mathieu Lirzin Cc: guix-devel@gnu.org On Thu, Aug 04, 2016 at 04:45:56PM +0200, Mathieu Lirzin wrote: > With gpg-agent and git properly setup, signing every local commit is not > that inconvenient IME. 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`.