diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | dgit | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4a0883c..724f784 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ dgit (5.3~) unstable; urgency=medium * git-debrebase new-upstream: Provide better reflog entries by setting GIT_REFLOG_ACTION. Closes:#901925. + Improvements: + * Better message formatting when --overwrite may be needed, + and a note about first dgit push in dgit(1). Closes:891031. + -- dgit (5.2) unstable; urgency=medium @@ -4013,10 +4013,12 @@ sub splitbrain_pseudomerge ($$$$) { infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]); 1; }) { + $@ =~ s/^\n//; chomp $@; print STDERR <<END; -$us: check failed (maybe --overwrite is needed, consult documentation) +$@ +| Not fast forward; maybe --overwrite is needed, see dgit(1) END - die "$@"; + finish -1; } my $r = pseudomerge_make_commit |