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

Re: [PATCH] reset: update help text

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Mar 31, 2011, 21:57 UTC
Message-ID
<20110331215741.GA20474@elie>
In-Reply-To
<7v39m3j780.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
Show 21 quoted lines
>> [1] Detailed semantics: for each path listed by "git diff --name-only
>> HEAD <commit>":
>>
>>  * if the worktree, index, and HEAD match, make the index and worktree
>>    match <commit>.
>>
>>  * otherwise, if it is "not easy" to keep local changes, error out.
>>    We are not going to do a three-way merge.  That is,
>>
>>    - if the index matches neither HEAD nor <commit>, error out;
>>    - if the index matches HEAD but not the worktree, error out.
>>
>>  * otherwise, it is "easy", so keep local changes.
>>
>>    - if the index already matches <commit>, leave the index and
>>      worktree alone.
>>    - if the index and worktree match HEAD, make them match the
>>      <commit> instead.
>
> The latter item in the last "otherwise" is the same as the first "if all
> match, move to the one from the named commit", isn't it?
Yes, sorry for the nonsense.
Previous: Junio C HamanoNext: Nguyen Thai Ngoc Duy
Message 7 of 9 in “reset: update help text”
  1. reset: update help textNguyễn Thái Ngọc Duy, Mar 29, 2011
  2. Nguyen Thai Ngoc DuyMar 29, 2011
  3. Jonathan NiederMar 29, 2011
  4. Nguyen Thai Ngoc DuyMar 31, 2011
  5. Jonathan NiederMar 31, 2011
  6. Junio C HamanoMar 31, 2011
  7. Jonathan NiederMar 31, 2011
  8. Nguyen Thai Ngoc DuyApr 2, 2011
  9. Junio C HamanoMar 31, 2011

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.