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

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

Tags

None

Referenced Files

	F165306955: D58514.id183119.diff
	Fri, Aug 7, 1:32 PM

	F165289097: D58514.id.diff
	Fri, Aug 7, 10:53 AM

	F165281051: D58514.id182958.diff
	Fri, Aug 7, 9:33 AM

	F165263349: D58514.diff
	Fri, Aug 7, 6:39 AM

	F165224696: D58514.id183119.diff
	Thu, Aug 6, 11:37 PM

	F165210248: D58514.id182948.diff
	Thu, Aug 6, 8:35 PM

	Unknown Object (File)
	Thu, Aug 6, 4:45 PM

	Unknown Object (File)
	Tue, Aug 4, 1:48 PM

View All 24 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 Not Applicable

Unit

Tests Not Applicable

Event Timeline

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

Herald added subscribers: ziaee, imp. · View Herald TranscriptTue, Jul 28, 1:26 PM

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

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

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

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

Avoid getattr

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

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

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

Closed by commit rGa7677a680f21: git-mfc: Add --abort and --continue flags (authored by markj). · Explain WhyThu, Jul 30, 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

66 lines

git-mfc.1

24 lines

Diff 183119

View Options

tools/tools/git/git-mfc