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

Re: [PATCH 6/6] template: Fix comment indentation in pre-rebase hook

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 10, 2013, 19:52 UTC
Message-ID
<7vli6hg2ut.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1370889365-6239-7-git-send-email-richih.mailinglist@gmail.com>
Richard Hartmann <richih.mailinglist@gmail.com> writes:
Show 32 quoted lines
> The other hooks use two whitespace for indentation instead of tabs
> to signify code in the example/echo output.
> Follow the same layout in templates/hooks--pre-rebase.sample
>
> Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
> ---
>  templates/hooks--pre-rebase.sample |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample
> index b74cd1d..43426e0 100755
> --- a/templates/hooks--pre-rebase.sample
> +++ b/templates/hooks--pre-rebase.sample
> @@ -157,13 +157,13 @@ B to be deleted.
>  
>  To compute (1):
>  
> -	git rev-list ^master ^topic next
> -	git rev-list ^master        next
> +  git rev-list ^master ^topic next
> +  git rev-list ^master        next
>  
> -	if these match, topic has not merged in next at all.
> +  if these match, topic has not merged in next at all.
>  
>  To compute (2):
>  
> -	git rev-list master..topic
> +  git rev-list master..topic
>  
> -	if this is empty, it is fully merged to "master".
> +  if this is empty, it is fully merged to "master".

I think offsetting the actual commands to the right is correct, but "if these match" and "if this is empty" should be flushed to left as this patch shows.

Previous: Richard HartmannNext: Richard Hartmann
Message 14 of 35 in “Janitorial work on hook templates”
  1. 0/4 Janitorial work on hook templatesRichard Hartmann, Jun 10, 2013
  2. 1/6 templates: Fewer subprocesses in pre-commit hookRichard Hartmann, Jun 10, 2013
  3. Junio C HamanoJun 10, 2013
  4. Richard HartmannJun 10, 2013
  5. Jeff KingJun 10, 2013
  6. 2/6 templates: Reformat pre-commit hook's messageRichard Hartmann, Jun 10, 2013
  7. Junio C HamanoJun 10, 2013
  8. 3/6 templates: Fix spelling in pre-commit hookRichard Hartmann, Jun 10, 2013
  9. 4/6 Documentation: Update manpage for pre-commit hookRichard Hartmann, Jun 10, 2013
  10. 5/6 templates: Fix ASCII art in pre-rebase hookRichard Hartmann, Jun 10, 2013
  11. Junio C HamanoJun 10, 2013
  12. Jeff KingJun 10, 2013
  13. 6/6 template: Fix comment indentation in pre-rebase hookRichard Hartmann, Jun 10, 2013
  14. Junio C HamanoJun 10, 2013
  15. Richard HartmannJun 10, 2013
  16. Junio C HamanoJun 10, 2013
  17. Richard HartmannJun 10, 2013
  18. 0/6 Update to janitorial work on hook templatesRichard Hartmann, Jul 14, 2013
  19. 1/6 templates: Use heredoc in pre-commit hookRichard Hartmann, Jul 14, 2013
  20. Jonathan NiederJul 14, 2013
  21. Junio C HamanoJul 15, 2013
  22. Junio C HamanoJul 14, 2013
  23. Richard HartmannJul 14, 2013
  24. Jonathan NiederJul 14, 2013
  25. Junio C HamanoJul 15, 2013
  26. 2/6 templates: Reformat pre-commit hook's messageRichard Hartmann, Jul 14, 2013
  27. Jonathan NiederJul 14, 2013
  28. 3/6 templates: Fix spelling in pre-commit hookRichard Hartmann, Jul 14, 2013
  29. 4/6 Documentation: Update manpage for pre-commit hookRichard Hartmann, Jul 14, 2013
  30. Jonathan NiederJul 14, 2013
  31. Junio C HamanoJul 15, 2013
  32. 5/6 templates: Fix ASCII art in pre-rebase hookRichard Hartmann, Jul 14, 2013
  33. Jonathan NiederJul 14, 2013
  34. 6/6 template: Fix comment indentation in pre-rebase hookRichard Hartmann, Jul 14, 2013
  35. Jonathan NiederJul 14, 2013

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.