l0ng-ai fc938ac567 fix(vcs): update, push, rebase, tags and file history behave as expected (#1708) ...

Update Project
- The update summary and View Commits cover only the incoming commits
  (merge base with the tracked branch before and after), not rebased local
  commits or the merge commit.
- An update that stops on conflicts opens the Conflicts dialog instead of an
  error balloon.
- The Update dialog remembers the chosen method, has "Don't show again", and
  "Reset to the Remote Branch" (fetch, drop local commits, keep local changes).

Push
- A rejected push asks Merge / Rebase (Rebase Anyway with unpushed merges) with
  "remember and update silently", updates every repository and pushes again,
  up to ten times, without an error balloon first.
- A tag that already exists, a hook or server refusal is not treated as a
  non-fast-forward rejection; a stale force-with-lease offers "Force push anyway".
- Run Git hooks (--no-verify) when a pre-push hook exists; Set upstream also when
  pushing to another branch name; multi-repository push continues past failures.
- Tags: Push to <remote> and Delete (Restore, Delete on Remote).

Rebase
- Reword in an interactive rebase keeps message lines starting with '#'.
- Continue stages edits of files already staged; other unstaged changes report
  a clear error with Stage and Retry, Show Files and Abort.
- A stopped rebase or merge offers Abort in its error balloon; resolving the
  last conflict from the Conflicts dialog continues by itself.
- Branch menu rebase/merge use the full branch ref when a tag has the same name.
- Files keep their changelists while local changes are set aside.

File history follows renames done in merges and history merged from other
branches, and names the path of each revision.

2026-11-06 12:49:39 +08:00

..

block_history.rs

feat(vcs): show the history of the selected lines (#1266)

2026-11-05 00:07:44 +08:00

git_workflows.rs

fix(vcs): update, push, rebase, tags and file history behave as expected (#1708)

2026-11-06 12:49:39 +08:00

history_ops.rs

fix(vcs): keep local changes and staging intact across Git operations; roll back partial multi-repository operations (#1701)

2026-11-06 12:13:59 +08:00

ignore.rs

feat(vcs): add Add to .gitignore to the commit changes menu (#371)

2026-10-30 15:09:55 +08:00

log_projection.rs

fix(vcs): update, push, rebase, tags and file history behave as expected (#1708)

2026-11-06 12:49:39 +08:00

log_shape.rs

feat(vcs): correct Git log graph projection and expand history views (#1076)

2026-11-05 02:31:32 +08:00

repo.rs

fix(vcs): keep local changes and staging intact across Git operations; roll back partial multi-repository operations (#1701)

2026-11-06 12:13:59 +08:00