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

Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Aug 28, 2013, 23:22 UTC
Message-ID
<CAMP44s0ggDXfQ0GeCOyRHb25TgUkUGT_OSt3K6u5Ua+EatqD=g@mail.gmail.com>
In-Reply-To
<7vvc4xluxt.fsf@alter.siamese.dyndns.org>
On Fri, Jun 28, 2013 at 5:41 PM, Junio C Hamano <gitster@pobox.com> wrote:
> John Keeping <john@keeping.me.uk> writes:
Show 8 quoted lines
>> I don't think "git pull remote branch" falls into the same category as
>> plain "git pull" so I'm not convinced that defaulting to merge there is
>> unreasonable.  The original message about this [1] did talk about only
>> "git pull" with no arguments.
>
> If you want to limit the scope to only "git pull" (without any
> command line argument), I actually do not have strong preference for
> or against it either way.  Perhaps a follow-up patch to be squashed?

I do. Whether the user does 'git pull' or 'git pull origin' doesn't matter, we still want to reject non-fast-forward merges.

-- 
Felipe Contreras
Previous: Junio C HamanoNext: John Keeping
Message 49 of 69 in “first parent, commit graph layout, and pull merge direction”
  1. Andreas KreyMay 22, 2013
  2. Junio C HamanoMay 22, 2013
  3. Andreas KreyMay 23, 2013
  4. John SzakmeisterMay 23, 2013
  5. Jeremy RosenMay 23, 2013
  6. Andreas KreyMay 23, 2013
  7. John KeepingMay 23, 2013
  8. Junio C HamanoMay 23, 2013
  9. John KeepingMay 23, 2013
  10. Junio C HamanoMay 23, 2013
  11. John KeepingMay 23, 2013
  12. Felipe ContrerasMay 23, 2013
  13. Junio C HamanoMay 23, 2013
  14. Felipe ContrerasMay 23, 2013
  15. Junio C HamanoMay 23, 2013
  16. Felipe ContrerasMay 23, 2013
  17. Junio C HamanoMay 23, 2013
  18. Felipe ContrerasMay 23, 2013
  19. John KeepingMay 24, 2013
  20. John SzakmeisterMay 24, 2013
  21. Linus TorvaldsMay 24, 2013
  22. Junio C HamanoMay 24, 2013
  23. Linus TorvaldsMay 24, 2013
  24. Felipe ContrerasMay 24, 2013
  25. Felipe ContrerasMay 24, 2013
  26. Junio C HamanoMay 24, 2013
  27. Philip OakleyMay 24, 2013
  28. pull: require choice between rebase/merge on non-fast-forward pullJunio C Hamano, Jun 27, 2013
  29. W. Trevor KingJun 27, 2013
  30. Junio C HamanoJun 27, 2013
  31. W. Trevor KingJun 28, 2013
  32. Matthieu MoyJun 28, 2013
  33. W. Trevor KingJun 28, 2013
  34. Matthieu MoyJun 28, 2013
  35. W. Trevor KingJun 28, 2013
  36. Fredrik GustafssonJun 27, 2013
  37. Junio C HamanoJun 27, 2013
  38. W. Trevor KingJun 27, 2013
  39. Junio C HamanoJun 27, 2013
  40. Matthieu MoyJun 27, 2013
  41. W. Trevor KingJun 28, 2013
  42. John KeepingJun 28, 2013
  43. Junio C HamanoJun 28, 2013
  44. John KeepingJun 28, 2013
  45. Junio C HamanoJun 28, 2013
  46. John KeepingJul 2, 2013
  47. fixup! pull: require choice between rebase/merge on non-fast-forward pullJohn Keeping, Jul 14, 2013
  48. Junio C HamanoJul 15, 2013
  49. Felipe ContrerasAug 28, 2013
  50. John KeepingJul 18, 2013
  51. Andreas SchwabJul 18, 2013
  52. Junio C HamanoJul 18, 2013
  53. pull: require choice between rebase/merge on non-fast-forward pullJunio C Hamano, Jul 18, 2013
  54. Eric SunshineJul 19, 2013
  55. Junio C HamanoJul 19, 2013
  56. Eric SunshineJul 19, 2013
  57. Junio C HamanoJul 19, 2013
  58. Eric SunshineJul 19, 2013
  59. Junio C HamanoJul 19, 2013
  60. FlimmJan 22, 2014
  61. Andreas KreyMay 24, 2013
  62. Junio C HamanoMay 24, 2013
  63. Andreas KreyMay 23, 2013
  64. Holger Hellmuth (IKS)May 24, 2013
  65. Andreas KreyMay 24, 2013
  66. Holger Hellmuth (IKS)May 24, 2013
  67. Andreas KreyMay 24, 2013
  68. Felipe ContrerasMay 23, 2013
  69. Andreas KreyMay 23, 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.