Git diff -cc mode won't be displayed by difftool2019 Community Moderator ElectionHow 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?
Humans have energy, but not water. What happens?
Touchscreen-controlled dentist office snowman collector game
Coworker uses her breast-pump everywhere in the office
Counter-example to the existence of left Bousfield localization of combinatorial model category
My story is written in English, but is set in my home country. What language should I use for the dialogue?
How do anti-virus programs start at Windows boot?
What exactly is the purpose of connection links straped between the rocket and the launch pad
Provisioning profile doesn't include the application-identifier and keychain-access-groups entitlements
Is it illegal in Germany to take sick leave if you caused your own illness with food?
Is King K. Rool's down throw to up-special a true combo?
Good allowance savings plan?
What has been your most complicated TikZ drawing?
Why do Australian milk farmers need to protest supermarkets' milk price?
Is a lawful good "antagonist" effective?
What is the definition of "Natural Selection"?
Potentiometer like component
Single word request: Harming the benefactor
If the Captain's screens are out, does he switch seats with the co-pilot?
Excess Zinc in garden soil
Time dilation for a moving electronic clock
Examples of odd-dimensional manifolds that do not admit contact structure
What is the likely impact on flights of grounding an entire aircraft series?
Does anyone draw a parallel between Haman selling himself to Mordechai and Esav selling the birthright to Yaakov?
Time travel short story where dinosaur doesn't taste like chicken
Git diff -cc mode won't be displayed by difftool
2019 Community Moderator ElectionHow 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
190215
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
190215
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
190215
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
190215
asked Mar 7 at 10:12
CharlesCharles
190215
edited Mar 7 at 15:54
Charles
asked Mar 7 at 10:12
CharlesCharles
190215
asked Mar 7 at 10:12
CharlesCharles
190215
asked Mar 7 at 10:12
CharlesCharles
190215
190215
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
195k18243322
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
195k18243322
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
195k18243322
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
195k18243322
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
195k18243322
answered Mar 7 at 17:44
torektorek
195k18243322
answered Mar 7 at 17:44
torektorek
195k18243322
answered Mar 7 at 17:44
torektorek
195k18243322
195k18243322
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
