Re: [RFC/PATCH v2] create a skeleton for the command git rebase --status
- From
- Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>
- Date
- May 29, 2015, 10:40 UTC
- Message-ID
- <12496325.145058.1432896023146.JavaMail.zimbra@ensimag.grenoble-inp.fr>
- In-Reply-To
- <xmqq382gh465.fsf@gitster.dls.corp.google.com>
After this discussion I eventually agree that it would be better upgrading git status than creating a new command.When people use git status, it means that they need information to continue their work, so if you don't even know that you are in a rebase, you will very likely need information about the current rebase.
During a classic rebase we could have output like:
rebase in progress; onto d9d448a You are currently rebasing branch 'branche1' on 'd9d448a'. (fix conflicts and then run "git rebase --continue") (use "git rebase --skip" to skip this patch) (use "git rebase --abort" to check out the original branch) (5 commits applied, 3 remainings) Failed to apply:
252c273 commit message
Unmerged paths: (use "git reset HEAD <file>..." to unstage) (use "git add <file>..." to mark resolution)
both modified: file1
And during an interactive rebase:
rebase in progress; onto 247c883 You are currently editing a commit while rebasing branch 'b1.1' on '247c883'. (use "git commit --amend" to amend the current commit) (use "git rebase --continue" once you are satisfied with your changes)
Last commands done (5 commands done) :
pick 62609785 commit message1 reword 85ae9001 new commit message2
(See more at .git/rebase-merge/done)
Next commands to do (3 remainings commands) :
squash 62609785 commit message3 pick 85ae9001 commit message4
(See more at .git/rebase-merge/git-rebase-todo)
Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)
modified: file1 ...
Is it a good practice to send the user find information in the .git directory?
Thanks
Guillaume