Files F15424735

D14365.id34684.diff
No OneTemporary
Actions

Size

588 B

Referenced Files

None

Subscribers

None

D14365.id34684.diff
View Options

	diff --git a/src/land/ArcanistGitLandEngine.php b/src/land/ArcanistGitLandEngine.php
	--- a/src/land/ArcanistGitLandEngine.php
	+++ b/src/land/ArcanistGitLandEngine.php
	@@ -148,8 +148,11 @@

	try {
	if ($this->getShouldSquash()) {
	+ // NOTE: We're explicitly specifying "--ff" to override the presence
	+ // of "merge.ff" options in user configuration.
	+
	$api->execxLocal(
	- 'merge --no-stat --no-commit --squash -- %s',
	+ 'merge --no-stat --no-commit --ff --squash -- %s',
	$source);
	} else {
	$api->execxLocal(

File Metadata

Mime Type: text/plain
Expires: Mon, Mar 24, 12:11 AM (1 w, 3 d ago)
Storage Engine: blob
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: 7719252
Default Alt Text: D14365.id34684.diff (588 B)

Event Timeline