diff

git log has some very useful commit-limiting options , such as --no-merges and --first-parent . I'd like to be able to use these options when generating a cumulative diff patch/stat/numstat for a range of commits. With these commands: git log --oneline --first-parent --no-merges --patch 29665b0..0b76a27 git log --oneline --first-parent --no-merges --stat 29665b0..0b76a27 git log --oneline --first-parent --no-merges --numstat 29665b0..0b76a27 the diff is not cumulative (the changes are listed individually for each commit). With these commands: git diff --patch 29665b0..0b76a27 git diff --stat

Let's say I have this data.frame (with 3 variables) ID Period Score 123 2013 146 123 2014 133 23 2013 150 456 2013 205 456 2014 219 456 2015 140 78 2012 192 78 2013 199 78 2014 133 78 2015 170 Using dplyr I can group them by ID and filter these ID that appear more than once data <- data %>% group_by(ID) %>% filter(n() > 1) Now, what I like to achieve is to add a column that is: Difference = Score of Period P - Score of Period P-1 to get something like this: ID Period Score Difference 123 2013 146 123 2014 133 -13 456 2013 205 456 2014 219 14 456 2015 140 -79 78 2012 192 78 2013 199 7 78 2014

From the unix terminal, we can use diff file1 file2 to find the difference between two files. Is there a similar command to show the similarity across 2 files? (many pipes allowed if necessary. Each file contains a line with a string sentence; they are sorted and duplicate lines removed with sort file1 | uniq . file1 : http://pastebin.com/taRcegVn file2 : http://pastebin.com/2fXeMrHQ And the output should output the lines that appears in both files. output : http://pastebin.com/FnjXFshs I am able to use python to do it as such but i think it's a little too much to put into the terminal: x =

This is related to another question I recently asked about storing a non-bare repository in Dropbox for easy movement between computers, so it may be helpful to read that question for background. The gist is that the fileMode keeps reporting a diff for some number of files. I can't find a way to reproduce it consistently, but it happens frequently. What I've noticed is that the file, which has 644 permissions on both machines often reports a diff from 755 on one of the machines. This makes me think that Git believes the executable bit is set, but I can't figure out whether I can actually see

I set up some git filters in order to preprocess certain files (in my case IPython Notebooks) before committing them. To be more exact I'm following these instructions: https://stackoverflow.com/a/20844506/578770 This works fine and the files are correctly filtered if I commit my changes or if I review the change using the command line "git diff ". However, if I'm reviewing my changes using meld, the files are not filtered. I tried several way to set up meld as a diff tool for git: by calling git difftool by calling meld from a custom script But none of the solutions I've found for using meld