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

Re: [PATCH 3/5] git-jump: admit to passing merge mode args to ls-files

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Oct 3, 2023, 18:33 UTC
Message-ID
<CAPig+cQHAK2_LEG0-6MTF52t2D8b_SRxzB51B_4N35ujtGeb6Q@mail.gmail.com>
In-Reply-To
<20231003082107.3002173-3-stepnem@smrk.net>
On Tue, Oct 3, 2023 at 4:28 AM Štěpán Němec <stepnem@smrk.net> wrote:
Show 11 quoted lines
> There's even an example of such usage in the README.
>
> Signed-off-by: Štěpán Němec <stepnem@smrk.net>
> ---
> diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
> @@ -9,7 +9,7 @@ The <mode> parameter is one of:
>
>  diff: elements are diff hunks. Arguments are given to diff.
>
> -merge: elements are merge conflicts. Arguments are ignored.
> +merge: elements are merge conflicts. Arguments are given to ls-files -u.
Should "ls-files -u" be formatted with backticks?
    Arguments are passed to `git ls-files -u`.
Previous: Štěpán NěmecNext: Štěpán Němec
Message 4 of 20 in “Fix some typos, grammar or wording issues in the documentation”
  1. 1/5 Fix some typos, grammar or wording issues in the documentationŠtěpán Němec, Oct 3, 2023
  2. 2/5 doc/diff-options: improve wording of the log.diffMerges mentionŠtěpán Němec, Oct 3, 2023
  3. 3/5 git-jump: admit to passing merge mode args to ls-filesŠtěpán Němec, Oct 3, 2023
  4. Eric SunshineOct 3, 2023
  5. Štěpán NěmecOct 3, 2023
  6. Junio C HamanoOct 3, 2023
  7. Junio C HamanoOct 3, 2023
  8. 4/5 doc/gitk: s/sticked/stuck/Štěpán Němec, Oct 3, 2023
  9. 5/5 t/README: fix multi-prerequisite exampleŠtěpán Němec, Oct 3, 2023
  10. Eric SunshineOct 3, 2023
  11. Štěpán NěmecOct 3, 2023
  12. Junio C HamanoOct 3, 2023
  13. Eric SunshineOct 3, 2023
  14. 1/5 doc: fix some typos, grammar and wording issuesŠtěpán Němec, Oct 5, 2023
  15. 5/5 t/README: fix multi-prerequisite exampleŠtěpán Němec, Oct 5, 2023
  16. 3/5 git-jump: admit to passing merge mode args to ls-filesŠtěpán Němec, Oct 5, 2023
  17. 2/5 doc/diff-options: improve wording of the log.diffMerges mentionŠtěpán Němec, Oct 5, 2023
  18. 4/5 doc/gitk: s/sticked/stuck/Štěpán Němec, Oct 5, 2023
  19. Junio C HamanoOct 5, 2023
  20. Junio C HamanoOct 18, 2023

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.