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

Re: What's cooking in git.git (Mar 2020, #10; Tue, 31)

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Apr 2, 2020, 16:10 UTC
Message-ID
<3b472af5-2b23-a155-78b5-cf28c3494864@gmail.com>
In-Reply-To
<xmqq4ku46s8z.fsf@gitster.c.googlers.com>
Hi Junio
On 01/04/2020 00:04, Junio C Hamano wrote:
Show 31 quoted lines
> Here are the topics that have been cooking.  Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.  The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
> 
> [...]
> 
> * dl/merge-autostash (2020-03-24) 19 commits
>   - pull: pass --autostash to merge
>   - t5520: make test_pull_autostash() accept expect_parent_num
>   - merge: teach --autostash option
>   - sequencer: implement save_autostash()
>   - sequencer: unlink autostash in apply_autostash()
>   - sequencer: extract perform_autostash() from rebase
>   - rebase: generify create_autostash()
>   - rebase: extract create_autostash()
>   - reset: extract reset_head() from rebase
>   - rebase: generify reset_head()
>   - rebase: use apply_autostash() from sequencer.c
>   - sequencer: make apply_rebase() accept a path
>   - rebase: use read_oneliner()
>   - sequencer: make read_oneliner() extern
>   - sequencer: configurably warn on non-existent files
>   - sequencer: make read_oneliner() accept flags
>   - sequencer: use file strbuf for read_oneliner()
>   - t7600: use test_write_lines()
>   - Makefile: ASCII-sort += lists
> 
>   "git merge" learns the "--autostash" option.
> 
>   Will merge to 'next'.

I've posted some comments on this today, I'm not sure about the behavior of 'git reset' after 'git merge --autostash'

Best Wishes
Phillip
Previous: Junio C HamanoNext: Taylor Blau
Message 6 of 9 in “What's cooking in git.git (Mar 2020, #10; Tue, 31)”
  1. Junio C HamanoMar 31, 2020
  2. Miriam R.Apr 2, 2020
  3. Junio C HamanoApr 2, 2020
  4. Garima SinghApr 2, 2020
  5. Junio C HamanoApr 2, 2020
  6. Phillip WoodApr 2, 2020
  7. Taylor BlauApr 3, 2020
  8. Junio C HamanoApr 3, 2020
  9. Emily ShafferApr 3, 2020

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.