technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2026-02-02 15:45:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rules(git): divergent pull

Browse source
This commit is contained in:
iff 2025-01-13 20:46:51 +01:00
parent 334e9cd70d
commit 8c911fb09a
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rules/git.toml
View file

@ -141,3 +141,16 @@ git stash && \
{{command}} && \ {{command}} && \
git stash pop ''' git stash pop '''
] ]
[[match_err]]
pattern = [
"you have divergent branches and need to specify how to reconcile them"
]
suggest = [
'''
#[cmd_contains(pull)]
{{command}} --rebase ''',
'''
#[cmd_contains(pull)]
{{command}} --merge '''
]