Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show last commit changes in staged changes when amending #260

Open
jm4R opened this issue Jan 10, 2025 · 1 comment
Open

Show last commit changes in staged changes when amending #260

jm4R opened this issue Jan 10, 2025 · 1 comment
Labels
enhancement New feature or request

Comments

@jm4R
Copy link

jm4R commented Jan 10, 2025

Describe the bug
Amending commit can be treated as last commit modification so all the widgets (unstaged, staged, but also diff) should show both last commit modification and current, uncommitted ones. This is helpful especially when one wants to revert some changes from last commit. This is also my experience from git-cola client.

To Reproduce
Steps to reproduce the behavior:

  1. Modify file that was also modified in last commit (eg. X.txt)
  2. Modify file that wasn't modified in last commit (eg. Y.txt)
  3. Go to "Uncommited changes" view
  4. Check "Amend previous commit"

Expected behavior
Staged view should list X.txt (and possibly other files modified with last commit)
Unstaged view should list X.txt with uncommitted changes and Y.txt

Screenshots
not needed

Desktop (please complete the following information):

  • OS: any
  • Version: 1.4.3
@jm4R jm4R added the bug Something isn't working label Jan 10, 2025
@JetpackDuba
Copy link
Owner

Hey,

I see what you mean, not a bug tho. Gitnuro right now follows the same behavior as Git CLI. However, it's an interesting improvement for a future release.

@JetpackDuba JetpackDuba added enhancement New feature or request and removed bug Something isn't working labels Jan 13, 2025
@JetpackDuba JetpackDuba changed the title Amend doesn't show last commit changes in staged widget and diff Show last commit changes in staged changes when amending Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants