天道酬勤,学无止境

difftool

Using meld as difftool for git but listing all files in one window

I want to use meld as my diff tool for git. If I configure my .gitconfig like this : [difftool] prompt = false [diff] tool = meld and run command : $ git difftool then git open a meld window for each file which have changes. But I want one single window with all my files in the meld list box. I have read a little about -d or --dir-diff option. When I try : $ git difftool -d then a single windows is opened with one directory tree in each meld part, but either contain empty directories. I can not open my files from here. For infomation : $ git --version git version 1.9.1 $ meld --version meld 1

2021-11-28 22:11:18    分类:问答    git   git-config   meld   difftool   git-difftool

View already-committed Git merge in external 3-way diff tool

Is there any way to view a merge that has already been committed in a 3-way diff? If a huge merge between branches was committed 3 weeks ago, is there any way I can see a 3-way diff of it in an external diff-tool like BeyondCompare3? I'm looking for just the files changed in the merge commit. Bonus if I could get it to only show me the conflicts and anything manually changed, as opposed to seeing the entire difference of a file between the two branches. I wouldn't mind settling for a 2-way diff if the left side had the <<<<< ===== >>>>> conflict markers and the right side was the committed

2021-11-27 15:25:48    分类:问答    git   merge   commit   difftool

Getting Beyond Compare to Diff 2 Branches Simultaneously

>>git difftool branch1 branch2 opens my difftool (Beyond Compare:BC) with every file that has a diff between the branches. I have to close BC after each file just for it to reopen with the next file. BC can diff whole directories and multiple files. Is there a way to get git difftool to open all files simultaneously, or diff the whole tree simultaneously?

2021-11-27 11:01:14    分类:问答    git   branch   beyondcompare   difftool

Visual Studio Diff Tool - When is Editing Allowed?

I'm using Visual Studio 2013 and tfs 2013. Sometimes I'll make a code change and click compare with latest version. The diff tool will open and allows me to edit the file in the diff tool. However other times it will not let me edit but will read only. Is there some setting or something I need to do for me always allow edit? In a database project I've noticed that it never lets me edit in the diff tool. Is there some setting I need to change? I've searched around online but haven't found any answers to this. Thank you.

2021-11-22 05:00:38    分类:问答    visual-studio   tfs   difftool

如何在 git 中使用不同的合并和差异工具?(How to use different merge and diff tool in git?)

问题 我更喜欢使用meld作为差异工具。 但是它没有快速解决所有简单冲突的选项,所以在合并的情况下我想使用 kdiff3 我已经设置merge.tool到kdiff3和diff.guitool到MELD但git difftool仍始终运行kdiff3 [merge] tool = kdiff3 conflictstyle = diff3 [diff] guitool = meld renames = copies mnemonicPrefix = true [difftool] prompt = false 如何使git difftool运行meld ? 回答1 diff.guitool 仅在您使用 --gui 标志时适用。 设置diff.tool和merge.tool应该git difftool和git mergetool使用不同的工具: [merge] tool = kdiff3 [diff] tool = meld 回答2 注意:从 Git 2.22(2019 年第二季度)开始, {diff,merge}.{tool,guitool}配置变量的组合以合理的顺序作为彼此的后备设置。 请参阅 Denton Liu (Denton) 的 commit 6c22d71、commit 7f978d7、commit 60aced3、commit 884630b、commit

2021-10-18 21:05:31    分类:技术分享    git   diff   git-diff   mergetool   difftool

同一文件的暂存版本和未暂存版本之间的差异,使用 difftool [重复](Differences between the staged and unstaged versions of the same file, using difftool [duplicate])

问题 这个问题在这里已经有了答案: 在 git diff 中显示暂存树和工作树? (3 个回答) 4年前关闭。 有没有办法查看同一文件的staged版本和未unstaged版本之间的差异? 例如: Changes to be committed: modified: conf/application.conf Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: conf/application.conf 当我暂存更改然后再次修改文件而不暂存它时,就会发生这种情况。 EDIT git status -vv命令不够好,因为我需要使用diff / difftool命令。 那是因为在实践中,太多文件中有太多更改,滚动浏览所有这些文件效率不高。 但是diff / difftool允许我指定我感兴趣的文件。 回答1 git diff将显示您的工作区和索引之间的差异。 (索引是暂存文件所在的位置) 这可能看起来并不明显,因为我们通常使用git diff来查看工作区与签入内容的变化。但是,从技术上讲,

2021-10-09 02:06:18    分类:技术分享    git   diff   git-diff   difftool   git-stage

如何在单个 Bcomp3 窗口中为多个文件打开 git difftool?(How to open git difftool for multiple files in a single Bcomp3 window?)

问题 当使用来自 Git-Bash 的git difftool --tool=bc3 ,我为每个文件都有一个 BC3 窗口。 但是要查看下一个窗口,我必须关闭上一个窗口。 我想在单个 BC3 窗口中同时查看所有差异文件和选项卡。 回答1 我在 StackOverflow 上找到了正确的提示:#17736427。 使用git difftool --dir-diff (将 BC3 配置为 difftool)对我来说是可以的。 谁想要使用它,可能会发现 BC3 开关/expandall很有帮助。 我以前的解决方案是,递归调用 git-difftool 。 可能这个技巧对其他人有帮助。 所以我想在这里分享。 像这样更改你的 git-config: [difftool "bc3_all"] cmd = "git difftool --tool=bc3_single \"$REMOTE\" &" [difftool "bc3_single"] cmd = "bcomp \"$REMOTE\" \"$LOCAL\"" 我的第一次尝试是直接启动 BC3 作为后台进程: [difftool "bc3"] cmd = "bcomp \"$REMOTE\" \"$LOCAL\" &" 它不起作用,因为$LOCAL通常是一个临时文件。 当 BC3 窗口出现时, $LOCAL文件已经被删除。

2021-09-29 20:20:14    分类:技术分享    git   beyondcompare   difftool

执行 git difftool --dir-diff 后,由于某种原因修改了文件(after doing a git difftool --dir-diff, files are modified for some reason)

问题 执行git difftool --dir-diff ,我的工作区文件由于某种原因被修改。 我一直在猜测,它的转换之间的行结束符crlf和lf等......但是,这样做"git config core.autocrlf false ”或“ git config --global core.autocrlf false ”没有任何区别。 我曾尝试使用windiff 和beyond compare 作为自定义差异工具,但没有帮助。 这很糟糕,因为每次我查看 .csproj 文件中的一些更改时,都会重新加载该项目,因为它说该文件已被外部修改。 有任何想法吗? 回答1 可以声明自动转换的唯一其他方法是通过 .gitattributes 文件(请参阅 gitattributes): 使用像*.txt eol=lf (“Git:默认所有文本文件为 unix 换行符”)或* text=auto (“在 git repo 和工作副本中强制 LF eol”)这样的指令带内容过滤器(涂抹脚本)

2021-09-11 10:23:38    分类:技术分享    git   newline   difftool

after doing a git difftool --dir-diff, files are modified for some reason

After doing git difftool --dir-diff, my workspace files are modified for some reason. I've been guessing that it's converting the line endings between crlf and lf etc... However, doing "git config core.autocrlf false" or "git config --global core.autocrlf false" don't make any difference. I have tried using both windiff and beyond compare as the custom diff tool but it doesn't help. This is bad since every time I view some changes in my .csproj file, the project is reloaded since it said the file has been modified externally. Any ideas?

2021-09-05 10:04:47    分类:问答    git   newline   difftool

在“difftool”中查看“git log -p”的更改(View changes from “git log -p” in “difftool”)

问题 我正在使用git log -p master..newbranch获取分支更改以供审查,但它只给了我 diff 文件。 如何使用 meld 等外部​​工具查看此差异? 我想查看仅在此特定分支(从分支开始到提示)中发生了什么变化。 回答1 好的,我发现它是这样完成的: git difftool --dir-diff master...newbranch

2021-08-11 14:40:11    分类:技术分享    git   workflow   meld   difftool