git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] reset: add an example of how to split a commit into two

From
Duy Nguyen <pclouds@gmail.com>
Date
Feb 4, 2017, 12:36 UTC
Message-ID
<CACsJy8Bk=pnyYNr2OxhQCYgxQQtOU=GqXUfgseL1HatB6SQPnQ@mail.gmail.com>
In-Reply-To
<E363F108ABEF45CB99C2C721A90B5EA2@PhilipOakley>
On Sat, Feb 4, 2017 at 7:16 PM, Philip Oakley <philipoakley@iee.org> wrote:
Show 15 quoted lines
> From: "Duy Nguyen" <pclouds@gmail.com>
>>
>> On Sat, Feb 4, 2017 at 3:28 AM, Jacob Keller <jacob.e.keller@intel.com>
>> wrote:
>>>
>>> +------------
>>> +$ git reset HEAD^                           <1>
>>
>>
>> It may be a good idea to add -N here, so that 'add -p' can pick up the
>> new files if they are added in HEAD.
>
>
> When looking at the man page for `reset` [1] it implies that `-N` requires
> `--mixed` also to be given. Is that correct?
Yes. But since --mixed is the default mode, "reset -N" equals "reset --mixed -N"
> Or could the man page be clearer?
If someone makes questions, I guess the answer is yes it should be made clearer.
-- 
Duy
Previous: Philip Oakley
Message 5 of 5 in “reset: add an example of how to split a commit into two”
  1. reset: add an example of how to split a commit into twoJacob Keller, Feb 3, 2017
  2. Junio C HamanoFeb 3, 2017
  3. Duy NguyenFeb 4, 2017
  4. Philip OakleyFeb 4, 2017
  5. Duy NguyenFeb 4, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.