Git diff -cc mode won't be displayed by difftoolHow do I discard unstaged changes in Git?How to remove local (untracked) files from the current Git working tree?What is the difference between 'git pull' and 'git fetch'?How to undo 'git add' before commit?How do I undo the most recent commits in Git?How do I force “git pull” to overwrite local files?How do I check out a remote Git branch?How do I delete a Git branch both locally and remotely?How to revert a Git repository to a previous commitHow do I rename a local Git branch?
Female=gender counterpart?
Proof of Lemma: Every integer can be written as a product of primes
Can a Gentile theist be saved?
What does the "3am" section means in manpages?
Are Warlocks Arcane or Divine?
What is the opposite of 'gravitas'?
Calculating the number of days between 2 dates in Excel
Word describing multiple paths to the same abstract outcome
Installing PowerShell on 32-bit Kali OS fails
How to prevent YouTube from showing already watched videos?
Simulating a probability of 1 of 2^N with less than N random bits
Freedom of speech and where it applies
Proving by induction of n. Is this correct until this point?
What if somebody invests in my application?
Who must act to prevent Brexit on March 29th?
Can the electrostatic force be infinite in magnitude?
Can I Retrieve Email Addresses from BCC?
Pronouncing Homer as in modern Greek
The One-Electron Universe postulate is true - what simple change can I make to change the whole universe?
Why does this part of the Space Shuttle launch pad seem to be floating in air?
Why is delta-v is the most useful quantity for planning space travel?
Stereotypical names
Is a naturally all "male" species possible?
How can I raise concerns with a new DM about XP splitting?
Git diff -cc mode won't be displayed by difftool
How do I discard unstaged changes in Git?How to remove local (untracked) files from the current Git working tree?What is the difference between 'git pull' and 'git fetch'?How to undo 'git add' before commit?How do I undo the most recent commits in Git?How do I force “git pull” to overwrite local files?How do I check out a remote Git branch?How do I delete a Git branch both locally and remotely?How to revert a Git repository to a previous commitHow do I rename a local Git branch?
I'm not sure what's going on but I just set up my diff tool to be called by git difftool, yet the very first file difftool encounters is displayed in the standard diff manner - on the console with line-by line replacements
diff --cc path/to/file.c
index ac1b99f,da29e2e..0000000
--- a/path/to/file.c
+++ b/path/to/file.c
@@@ -186,18 -133,20 +188,18 @@@
code code code code
more code more code more code
-- old code old code old code [displayed in red]
++ new code new code new code [displayed in green]
even more code even more code
yet more code yet more code
This seems to be a special case of a diff as it has the --cc flag and a triple @ symbol (@@@ ) instead of a double one (@@), and most importantly a strange description of the revisions being diffed : hash1,hash2..0000000.
What exactly is this ? I chose Beyond Compare as my diff tool, can it handle those cases ? If not, might another be able to do so ?
git git-difftool
asked Mar 7 at 10:12
CharlesCharles
189215
add a comment |
I'm not sure what's going on but I just set up my diff tool to be called by git difftool, yet the very first file difftool encounters is displayed in the standard diff manner - on the console with line-by line replacements
diff --cc path/to/file.c
index ac1b99f,da29e2e..0000000
--- a/path/to/file.c
+++ b/path/to/file.c
@@@ -186,18 -133,20 +188,18 @@@
code code code code
more code more code more code
-- old code old code old code [displayed in red]
++ new code new code new code [displayed in green]
even more code even more code
yet more code yet more code
This seems to be a special case of a diff as it has the --cc flag and a triple @ symbol (@@@ ) instead of a double one (@@), and most importantly a strange description of the revisions being diffed : hash1,hash2..0000000.
What exactly is this ? I chose Beyond Compare as my diff tool, can it handle those cases ? If not, might another be able to do so ?
git git-difftool
asked Mar 7 at 10:12
CharlesCharles
189215
add a comment |
I'm not sure what's going on but I just set up my diff tool to be called by git difftool, yet the very first file difftool encounters is displayed in the standard diff manner - on the console with line-by line replacements
diff --cc path/to/file.c
index ac1b99f,da29e2e..0000000
--- a/path/to/file.c
+++ b/path/to/file.c
@@@ -186,18 -133,20 +188,18 @@@
code code code code
more code more code more code
-- old code old code old code [displayed in red]
++ new code new code new code [displayed in green]
even more code even more code
yet more code yet more code
This seems to be a special case of a diff as it has the --cc flag and a triple @ symbol (@@@ ) instead of a double one (@@), and most importantly a strange description of the revisions being diffed : hash1,hash2..0000000.
What exactly is this ? I chose Beyond Compare as my diff tool, can it handle those cases ? If not, might another be able to do so ?
git git-difftool
asked Mar 7 at 10:12
CharlesCharles
189215
I'm not sure what's going on but I just set up my diff tool to be called by git difftool, yet the very first file difftool encounters is displayed in the standard diff manner - on the console with line-by line replacements
diff --cc path/to/file.c
index ac1b99f,da29e2e..0000000
--- a/path/to/file.c
+++ b/path/to/file.c
@@@ -186,18 -133,20 +188,18 @@@
code code code code
more code more code more code
-- old code old code old code [displayed in red]
++ new code new code new code [displayed in green]
even more code even more code
yet more code yet more code
This seems to be a special case of a diff as it has the --cc flag and a triple @ symbol (@@@ ) instead of a double one (@@), and most importantly a strange description of the revisions being diffed : hash1,hash2..0000000.
What exactly is this ? I chose Beyond Compare as my diff tool, can it handle those cases ? If not, might another be able to do so ?
git git-difftool
git git-difftool
asked Mar 7 at 10:12
CharlesCharles
189215
asked Mar 7 at 10:12
CharlesCharles
189215
edited Mar 7 at 15:54
Charles
asked Mar 7 at 10:12
CharlesCharles
189215
asked Mar 7 at 10:12
CharlesCharles
189215
asked Mar 7 at 10:12
CharlesCharles
189215
189215
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
Combined diffs are peculiar to Git and generally not available anywhere else.
Git doesn't know how to invoke other commands to have them produce combined diffs, even if some other command would be able to do it.
(Git describes how to read combined diffs in one section of the various git diff documentation, and leaves out a crucial fact: combined diffs usually omit most of the differences. This fact is mentioned elsewhere in the documentation, far from the part one studies when trying to understand how to read a Git combined diff. Anyway, combined diffs are only really good for inspecting the merge-y parts of merges.)
answered Mar 7 at 17:44
torektorek
197k18246327
add a comment |
Your Answer
StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");
StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);
else
createEditor();
);
function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);
);
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55041163%2fgit-diff-cc-mode-wont-be-displayed-by-difftool%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
Combined diffs are peculiar to Git and generally not available anywhere else.
Git doesn't know how to invoke other commands to have them produce combined diffs, even if some other command would be able to do it.
(Git describes how to read combined diffs in one section of the various git diff documentation, and leaves out a crucial fact: combined diffs usually omit most of the differences. This fact is mentioned elsewhere in the documentation, far from the part one studies when trying to understand how to read a Git combined diff. Anyway, combined diffs are only really good for inspecting the merge-y parts of merges.)
answered Mar 7 at 17:44
torektorek
197k18246327
add a comment |
Combined diffs are peculiar to Git and generally not available anywhere else.
Git doesn't know how to invoke other commands to have them produce combined diffs, even if some other command would be able to do it.
(Git describes how to read combined diffs in one section of the various git diff documentation, and leaves out a crucial fact: combined diffs usually omit most of the differences. This fact is mentioned elsewhere in the documentation, far from the part one studies when trying to understand how to read a Git combined diff. Anyway, combined diffs are only really good for inspecting the merge-y parts of merges.)
answered Mar 7 at 17:44
torektorek
197k18246327
add a comment |
Combined diffs are peculiar to Git and generally not available anywhere else.
Git doesn't know how to invoke other commands to have them produce combined diffs, even if some other command would be able to do it.
(Git describes how to read combined diffs in one section of the various git diff documentation, and leaves out a crucial fact: combined diffs usually omit most of the differences. This fact is mentioned elsewhere in the documentation, far from the part one studies when trying to understand how to read a Git combined diff. Anyway, combined diffs are only really good for inspecting the merge-y parts of merges.)
answered Mar 7 at 17:44
torektorek
197k18246327
Combined diffs are peculiar to Git and generally not available anywhere else.
Git doesn't know how to invoke other commands to have them produce combined diffs, even if some other command would be able to do it.
(Git describes how to read combined diffs in one section of the various git diff documentation, and leaves out a crucial fact: combined diffs usually omit most of the differences. This fact is mentioned elsewhere in the documentation, far from the part one studies when trying to understand how to read a Git combined diff. Anyway, combined diffs are only really good for inspecting the merge-y parts of merges.)
answered Mar 7 at 17:44
torektorek
197k18246327
answered Mar 7 at 17:44
torektorek
197k18246327
answered Mar 7 at 17:44
torektorek
197k18246327
answered Mar 7 at 17:44
torektorek
197k18246327
197k18246327
add a comment |
add a comment |
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55041163%2fgit-diff-cc-mode-wont-be-displayed-by-difftool%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
