4 ms·
https://gist.github.com/romainl/a3ddb1d08764b93183260f8cdf0f524f https://gist.github.com/romainl/a3ddb1d08764b93183260f8cdf0f... This script in your path means
by porridgeraisin 2y ago
https://gist.github.com/romainl/a3ddb1d08764b93183260f8cdf0f524f https://gist.github.com/romainl/a3ddb1d08764b93183260f8cdf0f...
This script in your path means that after you say pull code and have merge conflicts, "git jump" will open vim with the quickfix list populated with the locations of the conflicts.
- gchamonlive 2y ago> NOTE: The original git-jump now supports the flag --stdout, which makes this hack redundant, but I will keep it for posterity This update is from May 2023
- ttyprintk 2y agoJump is distributed under /usr/share/git-core/contrib or something.
- porridgeraisin 2y agoAah, nice! I read that note about it being in contrib. Never bothered to find out whether contrib is distributed with the built git package or not.
- secondcoming 2y agoHow’s this different to ‘git mergetool’?