From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 32184211B3 for ; Sun, 2 Dec 2018 16:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725562AbeLBQ77 (ORCPT ); Sun, 2 Dec 2018 11:59:59 -0500 Received: from cpanel4.indieserve.net ([199.212.143.9]:33228 "EHLO cpanel4.indieserve.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbeLBQ77 (ORCPT ); Sun, 2 Dec 2018 11:59:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crashcourse.ca; s=default; h=Content-Type:MIME-Version:References: Message-ID:In-Reply-To:Subject:cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=GxQIo77Gz6C170uhxZH6mvZno1bLU+pebJjDvD9Vp4I=; b=vPnB2t92nHp7cOwnSNIFZnn0t OhtWp8GWky0k3P9O0D9NgvKWUKI0WxJ6m48Bxno9w2cLXonZz8A9x539dEvIFGgEAWdLWzlNVdxcc xLae6oPrV6J/H6cjBV6hgRLz3GCHYjRCrVtumM1M9jiP4N2ez/AlasqzeQP+IKIxr7v7bJR+ecznm JsplQMYgg5ezKcpaBdOf6Ua5SEQgiIhdi0f7N3C5U18d5vYJNPk0W1tQzxHfGyP9uyxiXQTweDZXb T5wpgC9PAtA/BrI8IBWn2/R1IFNhuhs1eT9V0ZJy5bHPxuWkrjRw2qPO0GUlTavp0lC/Xzc/zn3sL C+cWmdOjg==; Received: from cpef81d0f814063-cmf81d0f814060.cpe.net.cable.rogers.com ([174.114.57.56]:60118 helo=localhost.localdomain) by cpanel4.indieserve.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gTV62-0002Yh-Og; Sun, 02 Dec 2018 11:59:55 -0500 Date: Sun, 2 Dec 2018 11:59:53 -0500 (EST) From: "Robert P. J. Day" X-X-Sender: rpjday@localhost.localdomain To: Kevin Daudt cc: Git Mailing list Subject: Re: "git add -p" versus "git add -i", followed by "p" In-Reply-To: <20181202165242.GA4823@alpha> Message-ID: References: <20181202165242.GA4823@alpha> User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-OutGoing-Spam-Status: No, score=-0.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel4.indieserve.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - crashcourse.ca X-Get-Message-Sender-Via: cpanel4.indieserve.net: authenticated_id: rpjday+crashcourse.ca/only user confirmed/virtual account not confirmed X-Authenticated-Sender: cpanel4.indieserve.net: rpjday@crashcourse.ca X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sun, 2 Dec 2018, Kevin Daudt wrote: > On Sun, Dec 02, 2018 at 11:30:19AM -0500, Robert P. J. Day wrote: > > > > testing adding by patch for the very first time (i've just never > > needed this), and reading the "progit" book and reading the man page, > > and the impression i'm getting is that running "git add -p" (going > > straight to patch mode) is supposed to be equivalent to running "git > > add -i", then typing "p" to switch to patch mode. > > > > that is most emphatically not what i'm seeing. if i run "git add > > -p", then i get to what i expect -- the patch subsystem: > > > > $ git add -p > > diff --git a/README.asc b/README.asc > > index fa40bad..840e85b 100644 > > --- a/README.asc > > +++ b/README.asc > > @@ -1,3 +1,9 @@ > > +change 1 > > + > > + > > + > > + > > + > > = Pro Git, Second Edition > > > > Welcome to the second edition of the Pro Git book. > > Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? > > > > but if i start with "git add -i", there seems to be no way to get > > to patch mode -- certainly "p" doesn't do it. am i stupidly > > missing something trivial? is the explanation misleading or > > inncomplete? > > After selecting 'p', what do you get? > > You should see a list of modified files. You can select the files > you want to stage by the listed numbers. After you selected those > files, you press enter, and then you will get the options you'll > also see with git add -p. $ git add -i staged unstaged path 1: unchanged +12/-0 README.asc *** Commands *** 1: [s]tatus 2: [u]pdate 3: [r]evert 4: [a]dd untracked 5: [p]atch 6: [d]iff 7: [q]uit 8: [h]elp What now> p staged unstaged path 1: unchanged +12/-0 [R]EADME.asc Patch update>> 1 staged unstaged path * 1: unchanged +12/-0 [R]EADME.asc Patch update>> 1 staged unstaged path * 1: unchanged +12/-0 [R]EADME.asc Patch update>> and ... then what? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca/dokuwiki Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================