4259 links
  • Arnaud's links
  • Home
  • RSS Feed
  • Tag cloud
  • Login
search: tag:diff — newest first
  • Meld

    à tester

    August 10, 2019 - permalink - https://meldmerge.org/
    diff git merge tool
  • Note: diff -r overview

    diff -r folder1 folder2 | grep -P '(^diff|^Only)'

    diff -r folder1 folder2 | grep -P '(^diff|^Only)' | sed -r 's/^diff -r /vimdiff /'

    March 31, 2017 - permalink - https://links.infomee.fr/shaare/Gc4iwQ
    diff r
  • Github style diff in terminal with icdiff

    I'm happy with vimdiff (colorscheme Murphy) but why not!

    March 7, 2017 - permalink - http://blog.owen.cymru/github-style-diff-in-terminal-with-icdiff/
    diff
  • json diff
    February 19, 2015 - permalink - http://tlrobinson.net/projects/javascript-fun/jsondiff
    diff json
  • git diff - Show all changed files between two Git commits - Stack Overflow

    Je prends de plus en plus le réflexe de "git init" dans certains dossiers un peu chaud qui bougent beaucoup comme des dossiers de configuration..

    Et là arrive le moment où je me pose la question : qu'est ce que j'ai touché depuis que j'ai fais mon git ini ? Et voilà la commande magique qui répond à ma question :

    git diff --name-only SHA1 SHA2

    Après si vous voulez la liste entre le premier et le dernier commit :
    git diff --name-only HEAD $(git log --format=%H | tail -1)

    November 5, 2014 - permalink - http://stackoverflow.com/questions/1552340/show-all-changed-files-between-two-git-commits
    diff file git list
  • Diffuse

    Gui pour faire des diff visuellement

    via alk

    June 18, 2014 - permalink - http://diffuse.sourceforge.net/index.html
    diff
  • sorting - Bash - Difference Between two lists - Stack Overflow

    Pour obtenir la diff des éléments entre deux listes :

    To get the lines only in the old file:
    comm -23 <(sort /tmp/oldList) <(sort /tmp/newList)

    To get the lines only in the new file:
    comm -13 <(sort /tmp/oldList) <(sort /tmp/newList)

    comm -23 <(sort /tmp/1) <(sort /tmp/2)
    comm -13 <(sort /tmp/1) <(sort /tmp/2)

    March 19, 2014 - permalink - http://stackoverflow.com/questions/11165182/bash-difference-between-two-lists
    bash comm diff list
  • How to use vimdiff as the subversion diff tool | t+1
    January 9, 2014 - permalink - http://blog.tplus1.com/blog/2007/08/29/how-to-use-vimdiff-as-the-subversion-diff-tool/
    diff vim
  • How do diff over ssh? - Server Fault

    vimdiff /path/to/file scp://remotehost//path/to/file

    December 30, 2013 - permalink - http://serverfault.com/questions/59140/how-do-diff-over-ssh
    diff remote vim
  • Utiliser vim pour voir les diff de svn diff

    $svndiffx .classpath

    cat ~/bin/svndiffx

    !/bin/bash

    svn diff --diff-cmd "/home/amm/bin/svnvimdiff" $1

    $cat /home/amm/bin/svnvimdiff

    !/bin/bash

    vim -d $6 $7

    September 26, 2012 - permalink - https://links.infomee.fr/shaare/Fhxz-A
    diff memo svn