Ben Peart writes:
> On 5/7/2018 10:58 AM, Junio C Hamano wrote:
>
>> * bp/merge-rename-config (2018-05-04) 3 commits
>> - merge: pass aggressive when rename detection is turned off
>> - merge: add merge.renames config setting
>> - merge: update documentation for {merge,diff}.renameLimit
>>
On 5/7/2018 10:58 AM, Junio C Hamano wrote:
* bp/merge-rename-config (2018-05-04) 3 commits
- merge: pass aggressive when rename detection is turned off
- merge: add merge.renames config setting
- merge: update documentation for {merge,diff}.renameLimit
(this branch uses en/rename-dire
Elijah Newren writes:
>> Rename detection logic in "diff" family that is used in "merge" has
>> learned to guess when all of x/a, x/b and x/c have moved to z/a,
>> z/b and z/c, it is likely that x/d added in the meantime would also
>> want to move to z/d by taking the hint that the entire dir
Elijah Newren writes:
> I'm actually curious what the "Will merge to 'master'" and "Will merge
> to 'next'" are intended to mean in general. I thought it meant that
> the topic would be merged the following week barring further
> discussion, but that hasn't always been the case ...
These have a
Hi,
On Mon, May 7, 2018 at 8:20 AM, Derrick Stolee wrote:
> On 5/7/2018 10:58 AM, Junio C Hamano wrote:
>> Will merge to 'master'.
>
> These have been queued for master for a few weeks. Is anything delaying
> them?
I'm actually curious what the "Will merge to 'master'" and "Will merge
to 'nex
Hi Junio,
On Mon, May 7, 2018 at 7:58 AM, Junio C Hamano wrote:
> * en/rename-directory-detection-reboot (2018-04-25) 36 commits
> - merge-recursive: fix check for skipability of working tree updates
> - merge-recursive: make "Auto-merging" comment show for other merges
> - merge-recursive: fi
On 5/7/2018 10:58 AM, Junio C Hamano wrote:
* ds/generation-numbers (2018-05-02) 11 commits
- commit-graph.txt: update design document
- merge: check config before loading commits
- commit: use generation number in remove_redundant()
- commit: add short-circuit to paint_down_to_common()
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 described
8 matches
Mail list logo
