Skip to content

Instantly share code, notes, and snippets.

View ypkkhatri's full-sized avatar

Yougeshwar Khatri ypkkhatri

View GitHub Profile
@ypkkhatri
ypkkhatri / vimdiff.md
Created April 15, 2021 10:28 — forked from hyamamoto/vimdiff.md
The vimdiff cheat sheet as a git mergetool.

vimdiff cheat sheet

This is a vimdiff cheat sheet as a git mergetool.

Commands

]c - go to next difference 
@ypkkhatri
ypkkhatri / .git-commit-template
Created October 16, 2019 11:53 — forked from zakkak/.git-commit-template
This commit message template that helps you write great commit messages and enforce it across your team.
# [<tag>] (If applied, this commit will...) <subject> (Max 72 char)
# |<---- Preferably using up to 50 chars --->|<------------------->|
# Example:
# [feat] Implement automated commit messages
# (Optional) Explain why this change is being made
# |<---- Try To Limit Each Line to a Maximum Of 72 Characters ---->|
# (Optional) Provide links or keys to any relevant tickets, articles or other resources
# Example: Github issue #23