diff options
Diffstat (limited to 'contrib/git-jump/README')
| -rw-r--r-- | contrib/git-jump/README | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/git-jump/README b/contrib/git-jump/README index 2f618a7f97..8bcace29d2 100644 --- a/contrib/git-jump/README +++ b/contrib/git-jump/README @@ -65,6 +65,9 @@ git jump diff --cached # jump to merge conflicts git jump merge +# documentation conflicts are hard; skip past them for now +git jump merge :^Documentation + # jump to all instances of foo_bar git jump grep foo_bar |