git-mfc: Add --abort and --continue flags
ClosedPublic
Actions

Authored by markj on Jul 28 2026, 1:26 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Wed, Sep 16, 2:09 PM

	Unknown Object (File)
	Wed, Sep 16, 10:55 AM

	Unknown Object (File)
	Tue, Sep 15, 11:24 PM

	Unknown Object (File)
	Tue, Sep 15, 7:03 PM

	Unknown Object (File)
	Tue, Sep 15, 5:51 AM

	Unknown Object (File)
	Mon, Sep 14, 12:41 PM

	Unknown Object (File)
	Sun, Sep 13, 4:57 AM

	Unknown Object (File)
	Sat, Sep 12, 5:56 AM

View All 73 Files

Subscribers

imp

ziaee

Details

Reviewers

des

Group Reviewers

srcmgr

Commits

rGa7677a680f21: git-mfc: Add --abort and --continue flags

Summary

Instead of making the user run the underlying git-cherry-pick command
after a conflict.

Requested by: des

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 75231
Build 72114: arc lint + arc unit

Event Timeline

markj created this revision.Jul 28 2026, 1:26 PM

Herald added subscribers: ziaee, imp. · View Herald TranscriptJul 28 2026, 1:26 PM

markj requested review of this revision.Jul 28 2026, 1:26 PM

Harbormaster completed remote builds in B75231: Diff 182948.Jul 28 2026, 1:26 PM

des added inline comments.Jul 28 2026, 1:55 PM

tools/tools/git/git-mfc
454
504
528
534
571

Avoid getattr

Harbormaster completed remote builds in B75234: Diff 182958.Jul 28 2026, 2:14 PM

des accepted this revision.Jul 30 2026, 4:34 PM

This revision is now accepted and ready to land.Jul 30 2026, 4:34 PM

Closed by commit rGa7677a680f21: git-mfc: Add --abort and --continue flags (authored by markj). · Explain WhyJul 30 2026, 5:16 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rGa7677a680f21: git-mfc: Add --abort and --continue flags.

Revision Contents
Changeset List

Path

Size

tools/

git/

git-mfc

64 lines

git-mfc.1

24 lines

Diff 182948

View Options

tools/tools/git/git-mfc