Git Tips - Hackdot

Re:Git Tips by xavhan on Wednesday April 20, 2016 @04:43AM (#11533053)

love this one :

    git diff --name-only | uniq | xargs $EDITOR

(opens all modified files)

and this one to open files with conflicts

    git diff --name-only --diff-filter=U | uniq  | xargs $EDITOR

[ Parent | on HN ]

Re:Git Tips by Zardoz84 on Wednesday April 20, 2016 @08:09AM (#11533752)

List the files with changes

    git diff --stat

And git merge-tool & git diff-tool So I can use kdiff3 when I have merge conflicts.

[ Parent | on HN ]