Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

rebase -i: suggest using --edit-todo to fix an unknown instruction

We have now an explicit UI to edit the todo sheet and need not disclose
the name of the file.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 9c8e1011b9f6979777946ff87aae7b5846ed20a7 1 parent 9f4981b
authored September 19, 2012 gitster committed September 19, 2012

Showing 1 changed file with 3 additions and 2 deletions. Show diff stats Hide diff stats

  1. 5  git-rebase--interactive.sh
5  git-rebase--interactive.sh
@@ -575,11 +575,12 @@ do_next () {
575 575
 		;;
576 576
 	*)
577 577
 		warn "Unknown command: $command $sha1 $rest"
  578
+		fixtodo="Please fix this using 'git rebase --edit-todo'."
578 579
 		if git rev-parse --verify -q "$sha1" >/dev/null
579 580
 		then
580  
-			die_with_patch $sha1 "Please fix this in the file $todo."
  581
+			die_with_patch $sha1 "$fixtodo"
581 582
 		else
582  
-			die "Please fix this in the file $todo."
  583
+			die "$fixtodo"
583 584
 		fi
584 585
 		;;
585 586
 	esac

0 notes on commit 9c8e101

Please sign in to comment.
Something went wrong with that request. Please try again.