undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ag/rebase-p'

Browse Source 
The help message shown in the editor to edit todo list in "rebase -p"
has regressed recently, which has been corrected.

* ag/rebase-p:
  git-rebase--preserve-merges: fix formatting of todo help message
This commit is contained in:
Junio C Hamano 2018-07-24 14:50:44 -07:00
commit f72fd31063
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--preserve-merges.sh
View File

@ -891,9 +891,9 @@ $comment_char $(eval_ngettext \
EOF EOF
append_todo_help append_todo_help
gettext " gettext "
However, if you remove everything, the rebase will be aborted. However, if you remove everything, the rebase will be aborted.
" | git stripspace --comment-lines >>"$todo" " | git stripspace --comment-lines >>"$todo"
if test -z "$keep_empty" if test -z "$keep_empty"
then then