Diffusion Arcanist baf5eb8a8795

Explicitly provide "--ff" when performing squash merges in "arc land" under Git
baf5eb8a8795
Actions

Description

Explicitly provide "--ff" when performing squash merges in "arc land" under Git

Summary: Ref T3855. See discussion leading up to T3855#142304.

Test Plan: See T3855#142304.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T3855

Differential Revision: https://secure.phabricator.com/D14365

Details

Provenance

epriestley	Authored on
epriestley	Pushed on Oct 29 2015, 12:13 AM

Reviewer

chad

Differential Revision

D14365: Explicitly provide "--ff" when performing squash merges in "arc land" under Git

Parents

rARCc844669326ed: After pushing at the end of "arc land", cascade the origin through all local…

Branches

Unknown

Tags

Unknown

Tasks

T3855: `arc land` should work when the current branch/bookmark and the target branch/bookmark are the same

Build Status

Buildable 8493
Build 9786: Run Core Tests

Event Timeline

epriestley committed rARCbaf5eb8a8795: Explicitly provide "--ff" when performing squash merges in "arc land" under Git (authored by epriestley).Oct 29 2015, 12:13 AM

epriestley added a task: T3855: `arc land` should work when the current branch/bookmark and the target branch/bookmark are the same.

Harbormaster completed building B8493: rARCbaf5eb8a8795: Explicitly provide "--ff" when performing squash merges in "arc land" under Git.Oct 29 2015, 12:13 AM

tycho.tatitscheff mentioned this in T9669: Harbormaster working copy build step shouldn't crash when user don't set any also clone repository.Oct 29 2015, 5:48 PM

epriestley mentioned this in 2015 Week 44 (Very Late October).Nov 1 2015, 1:29 PM

epriestley mentioned this in T9802: `arc land` continues when the merge fails.Nov 16 2015, 7:15 PM

Changes (1)

Path

Size

src/

land/

ArcanistGitLandEngine.php

rARCbaf5eb8a8795

View Options

src/land/ArcanistGitLandEngine.php