From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Guillaume Pages <guillaume.pages@ensimag•grenoble-inp.fr>
Cc: Junio C Hamano <gitster@pobox•com>, Paul Tan <pyokagan@gmail•com>,
Antoine Delaite <antoine.delaite@ensimag•grenoble-inp.fr>,
Remi Galan <remi.galan-alfonso@ensimag•grenoble-inp.fr>,
Remi Lespinet <remi.lespinet@ensimag•grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag•grenoble-inp.fr>,
git@vger•kernel.org
Subject: Re: [RFC/PATCH v2] create a skeleton for the command git rebase --status
Date: Fri, 29 May 2015 17:00:20 +0200 [thread overview]
Message-ID: <vpq4mmvv37f.fsf@anie.imag.fr> (raw)
In-Reply-To: <12496325.145058.1432896023146.JavaMail.zimbra@ensimag.grenoble-inp.fr> (Guillaume Pages's message of "Fri, 29 May 2015 12:40:23 +0200 (CEST)")
Guillaume Pages <guillaume.pages@ensimag•grenoble-inp.fr> writes:
> 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
You messed-up something with the formatting, but I agree that this would
be nice. I'd reverse order between the hints ("(use ... to ...)") and
the "Failed to apply: ...".
> And during an interactive rebase:
>
> rebase in progress;
This could even become "interactive rebase in progress".
Most of the time, you're supposed to remember whether you ran "git
rebase" with -i, but a typical use-case is when a newbie requests help
like "I don't know what I did, but can you fix it?", and then any
information can be valuable.
> 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)
Not sure the blank lines are meant to be there, but I wouldn't put them
in the actual output. I'd format it as
Last commands done (5 commands done) :
pick 62609785 commit message1
(see more at .git/rebase-merge/done)
(lower-case "see" to be consistant with other hints)
> Is it a good practice to send the user find information in the .git
> directory?
We usually avoid doing that and provide commands to do this (e.g. "git
rebase --edit-todo" instead of asking the user to do $EDITOR
.git/rebase-merge/git-rebase-todo), but the ones you show seem OK to me.
There's already at least one instance of this when a rebase fails:
Patch failed at 0001 foo
The copy of the patch that failed is found in:
/tmp/clone/.git/rebase-apply/patch
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-05-29 15:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-28 14:20 [RFC/PATCH v2] create a skeleton for the command git rebase --status Guillaume Pagès
2015-05-28 15:39 ` Matthieu Moy
[not found] ` <CACRoPnRa1wrOJr=wGnR4NayZfe2yJ4F7Abv_sjqRpgQnicxm1g@mail.gmail.com>
2015-05-28 15:43 ` Guillaume Pages
2015-05-28 15:53 ` Matthieu Moy
2015-05-28 18:18 ` Junio C Hamano
2015-05-28 19:40 ` Matthieu Moy
2015-05-28 19:50 ` Junio C Hamano
2015-05-29 10:40 ` Guillaume Pages
2015-05-29 15:00 ` Matthieu Moy [this message]
2015-05-29 15:44 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq4mmvv37f.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=antoine.delaite@ensimag$(echo .)grenoble-inp.fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=guillaume.pages@ensimag$(echo .)grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag$(echo .)grenoble-inp.fr \
--cc=pyokagan@gmail$(echo .)com \
--cc=remi.galan-alfonso@ensimag$(echo .)grenoble-inp.fr \
--cc=remi.lespinet@ensimag$(echo .)grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox