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

Re: [PATCH v4 00/19] Make git-pull a builtin

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 18, 2015, 20:13 UTC
Message-ID
<xmqqfv5oepvh.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1434624852-6869-1-git-send-email-pyokagan@gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
Show 6 quoted lines
> This is a re-roll of [v3]. It squashes in Ramsay's patch "fix some sparse
> warnings", and fixes the use-before-free reported by Duy. Thanks a lot for
> dealing with my mess :-).
>
> Other than that, there are no other changes as I'm working on the git-am side
> of things.

I didn't look carefully, but does that mean 04/19 has the "what if you start from a subdirectory and are still using the scripted one?" issue we discussed recently for "am"?

Previous: Paul TanNext: Paul Tan
Message 21 of 22 in “Make git-pull a builtin”
  1. 00/19 Make git-pull a builtinPaul Tan, Jun 18, 2015
  2. 01/19 parse-options-cb: implement parse_opt_passthru()Paul Tan, Jun 18, 2015
  3. 02/19 parse-options-cb: implement parse_opt_passthru_argv()Paul Tan, Jun 18, 2015
  4. 03/19 argv-array: implement argv_array_pushv()Paul Tan, Jun 18, 2015
  5. 04/19 pull: implement skeletal builtin pullPaul Tan, Jun 18, 2015
  6. 05/19 pull: implement fetch + mergePaul Tan, Jun 18, 2015
  7. 06/19 pull: pass verbosity, --progress flags to fetch and mergePaul Tan, Jun 18, 2015
  8. 07/19 pull: pass git-merge's options to git-mergePaul Tan, Jun 18, 2015
  9. 08/19 pull: pass git-fetch's options to git-fetchPaul Tan, Jun 18, 2015
  10. 09/19 pull: error on no merge candidatesPaul Tan, Jun 18, 2015
  11. 10/19 pull: support pull.ff configPaul Tan, Jun 18, 2015
  12. 11/19 pull: check if in unresolved merge statePaul Tan, Jun 18, 2015
  13. 12/19 pull: fast-forward working tree if head is updatedPaul Tan, Jun 18, 2015
  14. 13/19 pull: implement pulling into an unborn branchPaul Tan, Jun 18, 2015
  15. 14/19 pull: set reflog messagePaul Tan, Jun 18, 2015
  16. 15/19 pull: teach git pull about --rebasePaul Tan, Jun 18, 2015
  17. 16/19 pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan, Jun 18, 2015
  18. 17/19 pull --rebase: exit early when the working directory is dirtyPaul Tan, Jun 18, 2015
  19. 18/19 pull --rebase: error on no merge candidate casesPaul Tan, Jun 18, 2015
  20. 19/19 pull: remove redirection to git-pull.shPaul Tan, Jun 18, 2015
  21. Junio C HamanoJun 18, 2015
  22. Paul TanJun 19, 2015

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.