Open ya55en opened 4 years ago
One more of these (git version 2.34.1):
$ git status
interactive rebase in progress; onto abcd123
Last command done (1 command done):
edit 04574a0 Fix slow options-menu registration issue
Next command to do (1 remaining command):
pick 1234567 Update README
(use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'main' on 'abcd123'.
(use "git commit --amend" to amend the current commit)
(use "git rebase --continue" once you are satisfied with your changes)
Untracked files:
(use "git add <file>..." to include in what will be committed)
package/module.py
nothing added to commit but untracked files present (use "git add" to track)
One more here, together with the output of git status --porcelain
:
$ git status
interactive rebase in progress; onto 8124a88
Last commands done (3 commands done):
pick fd11684 Rename and document FOO
pick 920aec5 Provide means for running bar
(see more in file .git/rebase-merge/done)
No commands remaining.
You are currently rebasing branch 'main' on '8af4c1b'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: .env.sample
modified: .gitignore
modified: Dockerfile
modified: Makefile
modified: README.md
new file: bin/build-image.sh
deleted: scripts/build-image.sh
Untracked files:
(use "git add <file>..." to include in what will be committed)
.env.test.reference
.idea/
docs/
yassen@cougar:~/Work/Dext/suppliers-app$ (% ꔷ) git status --porcelain
M .env.sample
M .gitignore
M Dockerfile
M Makefile
M README.md
A bin/build-image.sh
D scripts/build-image.sh
?? .env.docker.reference
?? .env.test.reference
?? .idea/
?? docs/
?? scripts/concurrency/
Support
interactive rebase in progress
status.Sample output given below: