[GH-ISSUE #300] `pull --rebase --autostash` does not retain authorship #107

New issue

Closed

opened 2026-03-02 04:11:52 +03:00 by kerem · 0 comments

kerem commented

2026-03-02 04:11:52 +03:00

Owner

Originally created by @acunniffe on GitHub (Dec 22, 2025).
Original GitHub issue: https://github.com/git-ai-project/git-ai/issues/300

Git will rebase the branch you're on when you pull with the --rebase flag. If there are any conflicting files it aborts, unless you use the --autostash flag. Autostash makes internal calls to stash push (pre checkout) and stash apply (post checkout).

Git AI supports stash when it's invoked externally but has no way to intercept the internal calls.

We'll have to read the git config and join them with the command args to make sure we know if you're intending to rebase and autostash because many developers have these set pull.rebase true pull.autostash true. If a developer is pulling with autostash, we have to stash their Authorship as a VA in-memory, and then restore it after the checkout completes in post-command.

Originally created by @acunniffe on GitHub (Dec 22, 2025). Original GitHub issue: https://github.com/git-ai-project/git-ai/issues/300 Git will rebase the branch you're on when you pull with the `--rebase` flag. If there are any conflicting files it aborts, unless you use the `--autostash` flag. Autostash makes internal calls to `stash push` (pre checkout) and `stash apply` (post checkout). Git AI supports `stash` when it's invoked externally but has no way to intercept the internal calls. We'll have to read the git config and join them with the command args to make sure we know if you're intending to rebase and autostash because many developers have these set `pull.rebase true` `pull.autostash true`. If a developer is pulling with autostash, we have to stash their Authorship as a VA in-memory, and then restore it after the checkout completes in post-command.