feat(git): 3-way merge editor, reflog, rebase/interactive rebase, reset with undo, force-with-lease push, remote branches and remotes

Server: git-rewrite.js (rebase + continue/skip/abort, rebase-interactive with
no editor, reset soft/mixed/keep/hard, undo-rewrite, force-push with lease,
remote-branch-delete, remote add/rename/remove) and git-conflicts.js
(conflict stages read + conflict-save, reflog), dispatched from runGitAction;
operationInProgress now reports a rebase and only ALLOWED_WHILE_REBASING
writes run during one. New reads: /git/conflict, /git/reflog, /git/remotes,
/git/rewrite-plan. Client: History tools menu, MergeEditor, ReflogView,
RebaseDialog, InteractiveRebase, ResetDialog, ForcePushDialog, RemotesDialog,
rebase banner Skip. CLAUDE.md git-writes rule rewritten for the new actions.

This commit is contained in:

nntrivi2001

2026-11-02 12:04:02 +07:00

parent 2cc492bb88

commit 2b5d7268ed

35 changed files with 5055 additions and 48 deletions

									
										server/openapi-extra.js
									
		+1
		
												View File
												
				@@ -68,6 +68,7 @@ module.exports = combine(

				  lanesMore,

				  toolsMore,

				  opsMore,

				  require("./openapi-extra/git-rewrite"),

				  overrideSessionsAgents,

				  overrideCore,

				  overridePricingAlerts,