Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

Johannes Schindelin writes: >> > Not quite. I have two more changes lined up. Let me send v4. >> >> Picked up and started looking at it. Thanks. > > FWIW v4's patches are identical to v5, but the interdiff as well as the > pushed tags are completely broken in v4

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

Elijah Newren writes: > patches. It's a trivial change and squashes cleanly, but if you're > merging this series to next, I'm curious whether I should submit this > change as a new patch on top of the series, if you'd prefer a full > re-roll of the whole series, or something

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On 2/21/2018 7:31 PM, Junio C Hamano wrote: * jh/status-no-ahead-behind (2018-01-24) 4 commits - status: support --no-ahead-behind in long format - status: update short status to respect --no-ahead-behind - status: add --[no-]ahead-behind to status and commit for V2 format. -

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

Hi Junio, On Fri, 23 Feb 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Wed, 21 Feb 2018, Junio C Hamano wrote: > > > >> * js/rebase-recreate-merge (2018-02-12) 12 commits > >> ... > >> > >> "git rebase" learned "--recreate-merges" to

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On Mon, Feb 26, 2018 at 5:17 AM, Duy Nguyen wrote: > On Thu, Feb 22, 2018 at 7:31 AM, Junio C Hamano wrote: >> * nd/worktree-move (2018-02-12) 7 commits >> >> "git worktree" learned move and remove subcommands. >> >> Expecting a reroll. >> cf.

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On Thu, Feb 22, 2018 at 7:31 AM, Junio C Hamano wrote: > * nd/worktree-move (2018-02-12) 7 commits > - worktree remove: allow it when $GIT_WORK_TREE is already gone > - worktree remove: new command > - worktree move: refuse to move worktrees with submodules > - worktree

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On Wed, Feb 21, 2018 at 4:31 PM, Junio C Hamano wrote: > * en/rename-directory-detection (2018-02-14) 29 commits > - merge-recursive: ensure we write updates for directory-renamed file > - merge-recursive: avoid spurious rename/rename conflict from dir renames > - directory

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

Johannes Schindelin writes: > Hi Junio, > > On Wed, 21 Feb 2018, Junio C Hamano wrote: > >> * js/rebase-recreate-merge (2018-02-12) 12 commits >> ... >> >> "git rebase" learned "--recreate-merges" to transplant the whole >> topology of commit graph elsewhere. >>

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On 22/02/18 00:31, Junio C Hamano wrote: > * pw/add-p-recount (2018-02-20) 9 commits > - add -p: don't rely on apply's '--recount' option > - add -p: fix counting when splitting and coalescing > - add -p: calculate offset delta for edited patches > - add -p: adjust offsets of subsequent hunks

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

Hi Junio, On Wed, 21 Feb 2018, Junio C Hamano wrote: > * js/rebase-recreate-merge (2018-02-12) 12 commits > - rebase -i: introduce --recreate-merges=[no-]rebase-cousins > - pull: accept --rebase=recreate to recreate the branch topology > - sequencer: handle post-rewrite for merge commands >

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

Brandon Williams writes: >> Is the 'fixup!' cleanly squashable to the problematic one, or does >> this series require another reroll to get it in a good enough shape? > > Yeah the fixup patch looks good to me. I don't think there was anything > else that needed attention so

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

On 02/21, Junio C Hamano wrote: > * bw/c-plus-plus (2018-02-14) 38 commits > - fixup! diff: rename 'this' variables > - replace: rename 'new' variables > - trailer: rename 'template' variables > - tempfile: rename 'template' variables > - wrapper: rename 'template' variables > - environment:

What's cooking in git.git (Feb 2018, #03; Wed, 21)

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. You can find the changes