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

Re: [PATCH 2/2] Fix t3404 assumption that `wc -l` does not use whitespace.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 28, 2008, 18:01 UTC
Message-ID
<alpine.DEB.1.00.0804281851520.19187@eeepc-johanness>
In-Reply-To
<7vd4oac5qf.fsf@gitster.siamese.dyndns.org>
Hi,
On Mon, 28 Apr 2008, Junio C Hamano wrote:
Show 13 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > Maybe an example would help:
> >
> > -- snip --
> > pick abcdefg This is the first commit to be picked
> > reset cdefghij
> > pick zyxwvux A commit in a side-branch
> > merge recursive abcdefg
> > -- snap --
> 
> Indeed it does.  "reset cdefghij" --- does it reset to the exact cdefghij
> commit, or cdefghij commit after rewriting?

In the example, it would be the original commit. However, a "reset abcdefg" _after_ the "pick abcdefg" line would refer to the _rewritten_ commit.

The rationale: you are most likely not wanting to reference _both_ the original _and_ the rewritten commit.

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 21 of 23 in “Fix t3404 assumption that `wc -l` does not use whitespace.”
  1. 2/2 Fix t3404 assumption that `wc -l` does not use whitespace.Brian Gernhardt, Apr 27, 2008
  2. Johannes SchindelinApr 27, 2008
  3. Brian GernhardtApr 27, 2008
  4. Jeff KingApr 28, 2008
  5. Mike RalphsonApr 28, 2008
  6. Jeff KingMay 13, 2008
  7. Mike RalphsonMay 13, 2008
  8. Mike RalphsonMay 15, 2008
  9. Jeff KingMay 15, 2008
  10. Jeff KingMay 15, 2008
  11. Junio C HamanoMay 15, 2008
  12. Mike RalphsonMay 16, 2008
  13. Brian GernhardtApr 28, 2008
  14. Junio C HamanoApr 27, 2008
  15. Johannes SchindelinApr 28, 2008
  16. Jörg SommerApr 28, 2008
  17. Johannes SchindelinApr 28, 2008
  18. Jörg SommerApr 28, 2008
  19. Johannes SchindelinApr 28, 2008
  20. Junio C HamanoApr 28, 2008
  21. Johannes SchindelinApr 28, 2008
  22. Junio C HamanoApr 28, 2008
  23. Johannes SchindelinApr 28, 2008

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.