git-diff Questions

2

Solved

How do I list files that are "diff"ed between my current local and the corresponding remote branch? The situation is that I had made a push to remote earlier and since then have rebased off master...
Smasher asked 19/9, 2018 at 13:37

2

I would like to know how exactly git diff applies the expression provided to xfuncname to the result and if it is possible to delegate the search for the hunk header text to another program. Contex...
Picaroon asked 5/6, 2018 at 10:2

5

Solved

I am required to print out the git diff output for the appendix of a thesis paper. I really like the output of git diff --color-words, but I have absolutely no idea how to bring this formatting, wi...
Noncommittal asked 28/9, 2012 at 16:12

2

Solved

I’m having a challenge to make git diff work in a Azure DevOps pipeline environment. Here is the pipeline script to compare the git HEAD with previous commit and only copy the files that have been ...

12

How can I see the differences between branches branch_1 and branch_2?
Medievalist asked 23/3, 2012 at 5:47

7

Solved

The output of git diff is optimized for code which tends to be one statement per line whereas text can (if authors like me are too lazy to use line breaks) cause diff output which is very hard to r...
Presidentelect asked 14/3, 2018 at 13:6

7

Solved

How do I show uncommitted changes in Git? I STFW'ed, and these commands are not working: teyan@TEYAN-THINK MINGW64 /d/nano/repos/PSTools/psservice (teyan/psservice) $ git status On branch teyan/p...
Burtburta asked 14/3, 2016 at 2:20

8

Solved

Is it possible to show the total file size difference between two commits? Something like: $ git file-size-diff 7f3219 bad418 # I wish this worked :) -1234 bytes I’ve tried: $ git diff --patch-...
Sirois asked 1/6, 2012 at 5:48

11

Solved

This often happens to me: I'm working on a couple related changes at the same time over the course of a day or two, and when it's time to commit, I end up forgetting what changed in a specific fi...
Redmer asked 6/4, 2012 at 6:3

27

Solved

I have a CMS theme installed on my machine. I'm tracking changes to it via git and decided to back it up on GitHub so I could share those changes. The theme as provided is also available on GitHub...
Tornado asked 28/4, 2014 at 14:54

13

Solved

How can we get the difference between two git repositories? The scenario: We have a repo_a and repo_b. The latter was created as a copy of repo_a. There have been parallel development in both the ...
Britannic asked 28/12, 2009 at 8:14

16

Solved

I would like to know how to see as a file with the command git diff master origin/master in the terminal on Visual Studio Code. I did a git fetch from my remote repository, and now I want to see t...
Piglet asked 13/7, 2018 at 0:39

5

Solved

How can I do a git diff in the opposite direction in the Atlassian SourceTree desktop app? In other words, how do I get SourceTree to do git diff b a instead of git diff a b? e.g., if my commits ar...
Coal asked 26/7, 2013 at 0:34

3

I am running git fetch origin in my production code and then am trying to a Git diff with my current branch with origin/master. I am facing this error while running the command: fatal: ambiguous a...
Hello asked 8/2, 2019 at 4:54

21

Solved

I want to merge two branches that have been separated for a while and wanted to know which files have been modified. Came across this link: http://linux.yyz.us/git-howto.html (moved to web.archive....
Tetrapterous asked 5/5, 2009 at 0:47

1

I found excellent answer https://mcmap.net/q/44958/-how-to-compare-files-from-two-different-branches I can see differences in file between branches: $ git diff my_branch..master -- the/file.md diff...
Independence asked 28/7, 2023 at 22:47

3

Why does git diff not work with process substitution? $ echo hallo > hallo $ echo holla > holla $ git diff hallo holla # works $ git diff hallo <(cat holla) # works not diff --git a/ha...
Reaction asked 28/3, 2014 at 7:29

6

I created a diff file by a command: git --no-pager diff --no-index --stat pathA pathB >\diff.log Nextly, I executed a command: git apply --index --ignore-space-change --ignore-whitespace \dif...
Pluck asked 2/1, 2019 at 18:49

3

Solved

I have a series of commits by different authors and I would like to see a git dff output between 2 commits but only considering the commits by one of the authors, something like, something like --a...
Repetitive asked 18/8, 2010 at 6:15

13

Solved

In a project where some of the files contain ^M as newline separators, diffing these files is apparently impossible, since git diff sees the entire file as just a single line. How does one git diff...
Barefoot asked 11/12, 2009 at 17:23

19

Solved

When I type git diff, I'd like to see a side-by-side diff, like with diff -y, or like to display the diff in an interactive diff tool like kdiff3. How can this be done?
Lanalanae asked 6/10, 2011 at 3:10

5

When I have a merge commit and run git show <commit-ish>, it shows only the commit log, not the the diffs: commit c0f50178901e09a1237f7b9d9173ec5d1c4936c Merge: ed234b ded051 Author: abc Date...
Tamqrah asked 6/12, 2016 at 1:51

7

Solved

How do I create a patch with full context? I tried --unified=2000, which gives 2000 lines of context: git diff --unified=2000 branch master --no-prefix > patch How do I include all the lines in...
Creativity asked 29/11, 2012 at 14:9

3

Solved

I'm going through a codebase and fixing whitespace oddities and generally correcting indentation and such things, and I want to make sure I haven't inadvertently made any other changes, so I'm doin...
Mashie asked 15/10, 2015 at 22:13

2

Solved

Within a Git worktree directory within a Docker container, I'm getting the error error: unknown option `cached' when running git diff --cached. Git is on version 2.32.0 which clearly states it shou...
Langham asked 6/10, 2021 at 17:14

© 2022 - 2025 — McMap. All rights reserved.