diff Questions
3
Is it possible to configure git diff to respect indentation and syntax?
I am not talking about ignoring indentation and spaces, but rather to use blank lines, indentation levels and possibly bracke...
Howlyn asked 11/6, 2014 at 12:15
8
Solved
I have started using IPython notebook quite a bit for writing up draft sections for my dissertation. However, given two versions of a draft (i.e., notebook), I would like to be able to generate som...
Sambar asked 11/8, 2013 at 12:37
4
Solved
Setup: 3 git repos - on github, local and on staging server.
I develop locally, push it to github and staging server pulls.
I don't work nor commit changes on staging server, but I must have done...
13
Solved
I have two large files (sets of filenames). Roughly 30.000 lines in each file. I am trying to find a fast way of finding lines in file1 that are not present in file2.
For example, if this is file1:...
22
Solved
I have deleted a file or some code in a file sometime in the past. Can I search through the content (not just the commit messages)?
A very poor solution is to grep the log:
git log -p | grep <pa...
22
Solved
I have deleted a file or some code in a file sometime in the past. Can I search through the content (not just the commit messages)?
A very poor solution is to grep the log:
git log -p | grep <pa...
22
Solved
I have deleted a file or some code in a file sometime in the past. Can I search through the content (not just the commit messages)?
A very poor solution is to grep the log:
git log -p | grep <pa...
22
Solved
I have deleted a file or some code in a file sometime in the past. Can I search through the content (not just the commit messages)?
A very poor solution is to grep the log:
git log -p | grep <pa...
25
Solved
How can I see the diff between a local branch and a remote branch?
7
I'm using Intellij IDEA 14 on Windows and Git as VCS on Unix server.
The line separator in Windows is CLRF (\r\n) and LF (\n) in Unix.
In Git, I'm using config --global core.autocrlf input. This wi...
Puffball asked 14/11, 2014 at 9:37
9
Solved
I know that I can view the difference between HEAD and current state with meld .. But how can I view the differences between branches, for example master and devel with meld?
At the moment I do th...
6
Solved
I'm reviewing a patch that moved a lot of things around, added a few things, and removed a few things. I'm wondering if anyone's written a utility for picking out the unique adds/removes in a unive...
10
Solved
Is it possible to take the difference of two arrays in Bash. What is a good way to do it?
Code:
Array1=( "key1" "key2" "key3" "key4" "key5" "k...
3
Solved
Are there any established or existing formats or conventions for representing the diff between two JSON documents?
Lets say that two remote nodes (or a server/client) both have some data represent...
5
Solved
So, What happens to Xamarin.Forms?
What is Multi-platform App UI?
What are the key differences or advantages that MAUI offers over Xamarin for cross-platform app development?
Where can develo...
Abstinence asked 4/7, 2020 at 13:34
8
Solved
Say I get a patch created with git format-patch. The file is basically a unified diff with some metadata. If I open the file in Vim, I can see which lines have been modified, but I cannot see which...
6
kustomize's docs provides a nice one-liner that compares two different overlays...
diff \
<(kustomize build $OVERLAYS/staging) \
<(kustomize build $OVERLAYS/production)
is there a way to...
Edmonson asked 4/2, 2020 at 5:33
3
Solved
Greetings,
I was wondering if there was a way to suppress ALL output of the diff command
so that it doesn't output the differences but only returns a success status?
diff $FILE1 $FILE2
if [ $? -n...
3
Solved
How can I compare two minified json files in beyond compare? Is there a built in file format for json? I'm looking to compare two pretty print representations of the underlying json objects.
Pyrites asked 30/3, 2020 at 2:52
5
Solved
I'd like see a visual diff of a branched file. So I do this
p4 diff2 -b branchname main.cpp
One problem... it's not visual and external diff isn't supported.
http://www.perforce.com/perforce/do...
3
Solved
Since Xcode 13, code comparison default is no longer a side-by-side diff.
There must be a way of doing this still.
I am struggling to find the option!
10
Solved
I have a shell script in which I need to check whether two files contain the same data or not. I do this a for a lot of files, and in my script the diff command seems to be the performance bottlene...
4
Solved
I am working with DeepDiff. So I have results like:
local = [{1: {'age': 50, 'name': 'foo'}}, {2: {'age': 90, 'name': 'bar'}}, {3: {'age': 60, 'name': 'foobar'}}]
online = [{1: {'age': 50, 'name':...
4
Solved
When git shows the diff between two versions, it has the ability to show sections that have moved (as opposed to just added or removed) in a particular color, using the colorMoved = default config ...
Coinage asked 28/2, 2021 at 20:18
5
Solved
I have two arrays of objects:
var a = [ {'id': 20}, {'id': 15}, {'id': 10}, {'id': 17}, {'id': 23} ];
var b = [ {'id': 90}, {'id': 15}, {'id': 17}, {'id': 23} ];
I'd like to get objects which...
Fellow asked 16/7, 2011 at 5:53
© 2022 - 2025 — McMap. All rights reserved.