ya55en / git-goodies

Useful git-related add-ons and configs
MIT License
0 stars 0 forks source link

Support 'interactive rebase in progress' status #5

Open ya55en opened 4 years ago

ya55en commented 4 years ago

Support interactive rebase in progress status.

Sample output given below:

interactive rebase in progress; onto 10137ee
No commands done.
Next commands to do (2 remaining commands):
   s 1b72826 KI-245 fix tests
   pick 811c3e4 KI-245 fix tests
  (use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'master' on '10137ee'.
  (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)

    tests/e2e_tests/
    tests/unit_tests/kyc_utils_tests/test_net.py
    tests/unit_tests/testing_utils_tests/

nothing added to commit but untracked files present (use "git add" to track)
ya55en commented 2 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)
ya55en commented 1 year ago

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/