diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 8978668..c89c39a 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1796,6 +1796,7 @@ function! fugitive#BufReadStatus() abort
     nnoremap <buffer> <silent> gs :<C-U>exe <SID>StageJump(v:count, 'Staged')<CR>
     nnoremap <buffer> <silent> gp :<C-U>exe <SID>StageJump(v:count, 'Unpushed')<CR>
     nnoremap <buffer> <silent> gP :<C-U>exe <SID>StageJump(v:count, 'Unpulled')<CR>
+    nnoremap <buffer> <silent> gr :<C-U>exe <SID>StageJump(v:count, 'Rebasing')<CR>
     nnoremap <buffer> <silent> C :<C-U>Gcommit<CR>:echohl WarningMsg<Bar>echo ':Gstatus C is deprecated in favor of cc'<Bar>echohl NONE<CR>
     nnoremap <buffer> <silent> a :<C-U>execute <SID>Do('Toggle',0)<CR>
     nnoremap <buffer> <silent> i :<C-U>execute <SID>StageIntend(v:count1)<CR>
@@ -2611,7 +2612,7 @@ endfunction
 
 function! s:NextFileHunk(count) abort
   for i in range(a:count)
-    call search('^[A-Z?] .\|^diff --\|^[0-9a-f]\{4,\} \|^@','W')
+    call search('^[A-Z?] .\|^diff --\|^\%(\l\{3,\} \)\=[0-9a-f]\{4,\} \|^@','W')
   endfor
   call s:StageReveal()
   return '.'
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index bcf1552..02e0d34 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -346,6 +346,9 @@ gp                      Jump to "Unpushed" section.
                                                 *fugitive_gP*
 gP                      Jump to "Unpulled" section.
 
+                                                *fugitive_gr*
+gr                      Jump to "Rebasing" section.
+
                                                 *fugitive_c*
 Commit mappings ~