Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

Re: [PATCH try2] Improve error output of git-rebase

From: Stephan Beyer <hidden>
Date: 2016-06-15 22:45:10

Hi,

Stephan Beyer wrote:
quoted hunk ↗ jump to hunk
@@ -285,7 +294,7 @@ else
 	if test -d "$dotest"
 	then
 		die "previous rebase directory $dotest still exists." \
-			'try git-rebase < --continue | --abort >'
+			'Try git-rebase (--continue | --abort | --skip)'
				^^
			This should perhaps be dashless. :\

And when "git rebase -m" has been invoked, a conflict occurs and the
user is typing "git rebase", then

	fatal: Needed a single revision
	invalid upstream

shows up again. So the patch does not affect all cases... :|

Regards

-- 
Stephan Beyer [off-list ref], PGP 0x6EDDD207FCC5040F
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help