4,672 questions
2
votes
1
answer
142
views
diff v3.12: option --from-file seems to be buggy
I found an issue with diff v3.12 and option --from-file, system OpenSUSE tumbleweed.
If I use command diff FILE1 FILE2 FILE3 --from-file OTHER-DIR/ (with and without trailing slash), only FILE1 is ...
- 3,869
Tooling
0
votes
0
replies
75
views
Reviewing conflict resolutions in GUI
Given a merge commit, git show --remerge-diff shows how the recorded merge result differs from a hypothetical re-merge.
Is there a way to see this graphically, something like a GUI tool would show a 3-...
- 3,338
Best practices
1
vote
2
replies
77
views
When to use "git diff -w" vs "git diff -b"?
What exactly is the difference between
git diff -w
and
git diff -b
? When should I use -b vs. -w?
The manpage says this, but I don't understand what the difference is:
-b, --ignore-space-change
...
- 5,916
0
votes
0
answers
49
views
Configure SourceTree to show code diff for HTML files (not rendered comparison)?
I'm using SourceTree for Git. I like it very much - except the fact that it shows diffs for HTML files in a visually rendered style:
I'd rather have a plain code diff like in VS Code:
For Markdown ...
- 13.4k
0
votes
2
answers
163
views
Can I make `git diff` generate a patch ignoring changes in comments?
I'm trying to use git diff to generate a patch file, which I can then give to diff2html to render into a nice page.
However, I'd like to have my patch only contain differences which are in non-comment ...
- 8,542
2
votes
1
answer
115
views
How to compare the changes in two branches?
Say I have four commits A, B, C and D, with A being an ancestor of B and C being an ancestor of D. I now want to verify that the changes from A to B are the same as the changes from C to D (or show ...
- 483
0
votes
1
answer
239
views
how to make git diff / wdiff / ... to do word diff and interpret changes on different adjacent lines always individually?
if you change this file:
div
{
max-width: 50%;
max-height: 50%;
}
into this:
div
{
max-width: 100%;
}
git diff --word-diff will print:
div
{
max-...
- 67
0
votes
1
answer
45
views
Differential code coverage policy at folder level in ADO pull requests
I'm exploring the usage of azurepipelines-coverage.xml to enable differential code coverage policy.
I would like to know if this supports a sub-folder level target for differential code coverage.
I ...
- 1,011
0
votes
2
answers
178
views
Using bash variables instead of files as input to git commands
I have a script which sets useful git settings and aliases, and I want to end by printing the difference between git config --global --list before and after. I'd like to show the diff in the same ...
- 1,744
0
votes
0
answers
51
views
How to compare XMLs and their nested content?
I have the following structure that I need to compare:
<ROOT>
<name>
<name>string</name>
<type>number</type>
<server>string</...
- 973
2
votes
1
answer
38
views
How to add filename to mercurial diff data
A colleague sent me the diff data of a file that he forgot to commit, before going on vacation. This diff data is the copy/past of the contents of the TortoiseHg Workbench diff window, with only code ...
- 890
5
votes
3
answers
141
views
calculate diff to previous matching row in a dataframe
I have a series of timestamps (+ other data) that come from 2 separate streams of data ticking at different rates, an example below (NB: the frequency of the real data has some jitter so it's not a ...
- 8,600
2
votes
0
answers
94
views
How do I implement a flow-controlled Netty pipeline with both a FlowControlHandler and HttpContentDecompressor?
Duplicating https://github.com/netty/netty/issues/15053:
I'm trying to build a flow-controlled Netty pipeline with (amongst other things) a FlowControlHandler near the top and a ...
- 166
2
votes
1
answer
397
views
Does Node.js have a built-in way to diff two strings?
I know there are third-party libraries for generating diffs in JavaScript, but I'm wondering if recent versions of Node.js include a native way to compare two strings and show their differences.
Is ...
- 2,633
0
votes
1
answer
161
views
Show differences between commits with respect to a base
We use a common git strategy:
branch from main to a feature branch.
do commits in feature.
if main progresses, merge it to feature.
merge feature to main.
I want to view the changes that happened ...
- 344
