public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jake Goulding <goulding@vivisimo•com>
To: git@vger•kernel.org
Subject: [REQ] Better error reporting when git rebase cannot rebase
Date: Wed, 02 Apr 2008 11:44:10 -0400	[thread overview]
Message-ID: <47F3A9CA.9090307@vivisimo.com> (raw)

Right now, if you have modified files in the working directory and 
attempt to do a git rebase, you will see messages like:

$ git rebase origin/master
Makefile: needs update

However, it isn't always clear that that means the rebase *did not 
work*. This has bitten a few of my developers a few times when they 
think that a rebase worked and that they need to perform some sort of 
"update" to the files in question.

I would suggest making this more explicit:

$ git rebase origin/master
* error: rebasing branch master on branch origin/master failed
Makefile: uncommitted changes would be overwritten

Thanks!

-Jake

next             reply	other threads:[~2008-04-02 16:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-02 15:44 Jake Goulding [this message]
2008-04-03  9:57 ` [REQ] Better error reporting when git rebase cannot rebase Jeff King
2008-04-03 13:38   ` Jake Goulding

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=47F3A9CA.9090307@vivisimo.com \
    --to=goulding@vivisimo$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox