Questions tagged [git-diff]
Shows changes between the working tree and the committed contents of a git repository, or between two commits or branches of the repository.
git-diff
1,120
questions
0
votes
1
answer
64
views
How to git diff on an Azure DevOps CI pipeline with more than one repository
There are a few helpful [questions and answers][1] online,
[1]: How to git diff on a Azure CI pipeline, but they seem to be working in a single-repository environment. I'm using one git repository for ...
- 23
1
vote
1
answer
61
views
List git changed files excluding what changed in the parent branch
I want to supply my linter tool with files that changed in my branch. The list should include:
files committed in my branch since branched from its parent
files changed and staged
files changed but ...
- 2,162
1
vote
0
answers
34
views
Git: Want to propagate (rebase) LF vs. CRLF changes through branch revisions
Say, I have a branch with several commits in it.
In versions A and B, I have a file with mixed line endings (mostly LF, but some CRLF), and made various other changes to it.
In version C, I made ...
- 486
1
vote
1
answer
57
views
Show a combined diff of a merge commit, including added files by either parent branch
After doing a merge which includes changes of a coworker, I want to them, to outline wheat each of us changed and how I resolved the conflicts.
The standard way that git displays merges, however, is ...
- 3,172
0
votes
0
answers
11
views
DiffMerge: Identical Files Marked As Inequivalent
I am comparing two folders, one I pulled down from GitHub and one that I've been working on locally and would like to push. DiffMerge displayed the files as different, as expected, so I went in and ...
- 636
1
vote
0
answers
39
views
View content that was added during the merge and comes from neither parent
During a merge with git 2.42.0.windows.2 and the Bash console, I had to manually perform some modifications to get it to compile, which I then committed along with the modifications due to the merge ...
- 1,163
0
votes
1
answer
61
views
Git shows modified files with no actual differences
I'm working on a large and complex corporate project and I'm encountering an issue with Git and Visual Studio solution files (.sln). I have two .sln files that Git identifies as completely edited, but ...
0
votes
0
answers
9
views
Different result between JGit diff and git diff
I'm trying to get differences of two commits in Java by JGit library. Here is my code:
public static void getDiffBlocks2(Git git, String javaFilePath) throws IOException {
Repository ...
- 19
1
vote
0
answers
34
views
git diff a file against the multiple files it was split into
I have a file A on branch old_branch that exists as multiple files A, B, C on a different branch new_branch. I need to merge old_branch into new_branch which would require me to resolve the merge ...
- 56
0
votes
0
answers
45
views
How to use git diff for modified files
Im trying to list all lines that have changed in modified files only, for this I'm using the following command
git diff --diff-filter=M
but still, I'm getting changes for new files that have been ...
- 6,127
0
votes
1
answer
27
views
How to see incoming commits in IntelliJ IDEA similarly to VS Code
In VS Code, on Source Control view at left, you can see incoming changes grouped by commits. You can explore commits, see changed files, and examine individual changes.
In IntelliJ IDEA, there seems ...
- 592
1
vote
2
answers
48
views
"git diff-index" showing unmodified files
I'm running the command git diff-index main in a repo that has the working tree equal to the branch main, but changes cached in the index. The command tells me that there are differences (I understand ...
0
votes
1
answer
42
views
Weird ^[[0K characters in git diff output (git delta)
I've been trying to make my git diff output nicer. Mainly I want side-by-side output, and so, I went with git-delta. Everything has been working great, but there is only one problem: git diff output ...
- 11
-1
votes
1
answer
39
views
Git diff shows difference between branches, but merge doesn't show all differences
I've got 2 branches I would like to merge: main and sub. In both branches there is a file called Math.java. This class contains one function on both branches: addition() on main and subtraktion() on ...
- 1
0
votes
2
answers
85
views
git merge-base HEAD <remote branch> doesn't return anything?
I'm cloning a certain branch of a repo. I then fetch a second branch. I ultimately want to run merge-base but every time I do it returns nothing:
git-init \
-url="${PARAM_URL}" \
-...
- 732