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

Re: [PATCH] Fix typos in the documentation.

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 27, 2008, 09:48 UTC
Message-ID
<7vwsepa48n.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20081127073201.GD8267@ins.uni-bonn.de>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:
> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
> ---
>
> This patch is against pu.

While I appreciate your fix, it would have been nicer to have at least three patches in this case, organized like this:

 * patch 1 applies to 'maint'. Let's call the result of such application
   'maint plus fix';
   In other words:
	$ git checkout -b rw/maint-typofix maint
        $ git am -s patch-1
 * patch 2 is to be applied on top of the result of merging 'maint plus
   fix' into 'master';
   In other words:
	$ git checkout -b rw/typofix master
        $ git merge rw/maint-typofix
        $ git am -s patch-2
 * patch 3 is to contain everything else (it would be even nicer if they
   are split up to apply to individual topic branches that are responsible
   for introducing the typos, but I realize that it would be asking too
   much).
   In other words:
	$ git checkout pu
        $ git merge rw/typofix
        $ git am -s patch-3
I've done the above splitting myself and further did:
	$ git checkout maint
        $ git merge rw/maint-typofix
        $ git branch -d rw/maint-typofix
        $ git checkout master
        $ git merge rw/typofix
        $ git branch -d rw/typofix

I did not create a single "patch-3" but squashed the fixes in to the respective commits on the topic branches, as they are only on 'pu' and not part of 'next' (hence I am free to amend and rebase them).

Thanks.
Previous: Andreas EricssonNext: Ralf Wildenhues
Message 3 of 4 in “Fix typos in the documentation.”
  1. Fix typos in the documentation.Ralf Wildenhues, Nov 27, 2008
  2. Andreas EricssonNov 27, 2008
  3. Junio C HamanoNov 27, 2008
  4. Ralf WildenhuesNov 27, 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.