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

Re: [PATCH 03/16] pull: cleanup documentation

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Oct 31, 2013, 18:37 UTC
Message-ID
<CAMP44s3AKnZUJy0O0Hg+G=ER2bRn1nHMBeoJQ=ugCzO4d2WZ-g@mail.gmail.com>
In-Reply-To
<xmqqiowd71kv.fsf@gitster.dls.corp.google.com>
On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 14 quoted lines
>> --- a/Documentation/git-pull.txt
>> +++ b/Documentation/git-pull.txt
>> @@ -39,7 +39,7 @@ Assume the following history exists and the current branch is
>>  "`master`":
>>
>>  ------------
>> -       A---B---C master on origin
>> +       A---B---C origin/master
>>        /
>>      D---E---F---G master
>>  ------------
>
> This change is wrong; the illustration depicts the distributed world
> (i.e. a fetch has not happened yet).

That is an irrelevant implementation detail, specially at this high level. In the user's mind origin/master means master on origin.

If you want to be pedantic, this is the "reality":
  ------------
      D---E---F---G master
  ------------
-- 
Felipe Contreras
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 48 in “Trivial patches”
  1. 00/16 Trivial patchesFelipe Contreras, Oct 31, 2013
  2. 01/16 merge: simplify ff-only optionFelipe Contreras, Oct 31, 2013
  3. Junio C HamanoOct 31, 2013
  4. 02/16 t: replace pulls with mergesFelipe Contreras, Oct 31, 2013
  5. 03/16 pull: cleanup documentationFelipe Contreras, Oct 31, 2013
  6. Junio C HamanoOct 31, 2013
  7. Felipe ContrerasOct 31, 2013
  8. Junio C HamanoOct 31, 2013
  9. Max HornOct 31, 2013
  10. Junio C HamanoOct 31, 2013
  11. Junio C HamanoOct 31, 2013
  12. Felipe ContrerasOct 31, 2013
  13. David AguilarOct 31, 2013
  14. Felipe ContrerasNov 1, 2013
  15. David AguilarNov 1, 2013
  16. Felipe ContrerasNov 1, 2013
  17. SZEDER GáborNov 1, 2013
  18. Felipe ContrerasNov 1, 2013
  19. Felipe ContrerasOct 31, 2013
  20. Junio C HamanoOct 31, 2013
  21. Felipe ContrerasOct 31, 2013
  22. 04/16 fetch: add missing documentationFelipe Contreras, Oct 31, 2013
  23. Junio C HamanoOct 31, 2013
  24. Felipe ContrerasOct 31, 2013
  25. 05/16 revision: add missing includeFelipe Contreras, Oct 31, 2013
  26. Junio C HamanoOct 31, 2013
  27. 06/16 shortlog: add missing declarationFelipe Contreras, Oct 31, 2013
  28. Junio C HamanoOct 31, 2013
  29. Felipe ContrerasOct 31, 2013
  30. Junio C HamanoOct 31, 2013
  31. Felipe ContrerasOct 31, 2013
  32. 07/16 branch: trivial style fixFelipe Contreras, Oct 31, 2013
  33. Junio C HamanoOct 31, 2013
  34. 08/16 sha1-name: trivial style cleanupFelipe Contreras, Oct 31, 2013
  35. 09/16 transport-helper: trivial style fixFelipe Contreras, Oct 31, 2013
  36. 10/16 describe: trivial style fixesFelipe Contreras, Oct 31, 2013
  37. 11/16 pretty: trivial style fixFelipe Contreras, Oct 31, 2013
  38. 12/16 revision: trivial style fixesFelipe Contreras, Oct 31, 2013
  39. 13/16 diff: trivial style fixFelipe Contreras, Oct 31, 2013
  40. 14/16 run-command: trivial style fixesFelipe Contreras, Oct 31, 2013
  41. 15/16 setup: trivial style fixesFelipe Contreras, Oct 31, 2013
  42. Junio C HamanoOct 31, 2013
  43. 16/16 add: avoid yoda conditionsFelipe Contreras, Oct 31, 2013
  44. Martin von ZweigbergkOct 31, 2013
  45. Felipe ContrerasOct 31, 2013
  46. Junio C HamanoOct 31, 2013
  47. Felipe ContrerasOct 31, 2013
  48. Max HornOct 31, 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.