Git Product home page Git Product logo

git-diff3c's Introduction

git-diff3c

when reviewing merge conflicts, especially in a rebase, it's useful to visualize the diff between

  1. old changes -> new old changes (what upstream changed), and
  2. old changes -> new changes (what you changed)

setup

dependencies:

  • nodejs
    • yarn (npm i -g yarn)
    • diff-so-fancy (e.g. npm i -g diff-so-fancy)
npm i -g yarn diff-so-fancy

install

git clone https://github.com/kiprasmel/git-diff3c.git
# or:  git clone [email protected]:kiprasmel/git-diff3c.git

cd git-diff3c

./setup-and-update.sh

# https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-mergeconflictStyle
git config --global merge.conflictStyle zdiff3

and add to ~/.profile or equiv:

export PATH="$(yarn global dir)/node_modules/.bin:$PATH"

usage

git-diff3c
# specific files
git-diff3c [/path/to/file/with/conflicts[,/another]]

git-diff3c's People

Contributors

kiprasmel avatar

Stargazers

avatar avatar avatar

Watchers

avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.