gitk

我想合并两个已分开一段时间的分支，并想知道哪些文件已被修改。 看到这个链接： http ： //linux.yyz.us/git-howto.html 这非常有用。 比较我遇到的分支的工具是： git diff master..branch git log master..branch git shortlog master..branch 想知道是否有类似“git status master..branch”的东西只能看到两个分支之间不同的文件。 在没有创建新工具的情况下，我认为这是您现在可以做到的最接近的工具（如果文件被多次修改，当然会显示重复）： git diff master..branch | grep "^diff" 想知道是否有我遗漏的东西...... #1楼 还要记住，git具有便宜且易于分支的特点。 如果我认为合并可能有问题，我会为合并创建一个分支。 因此，如果 master 有我想要合并的更改， ba 是我需要master的代码的分支，我可能会执行以下操作： git checkout ba git checkout -b ba-merge git merge master .... review new code and fix conflicts.... git commit git checkout ba git merge ba-merge git

I'm learning about git and is using gitk to visualize my history and branches. I tried gitk on a locally initialized repo, and it is able to show both branches that I made properly. However, when I tried to launch gitk to visualize a repo obtained using git clone , gitk only shows one of the branches. This is what happen: After I did a git clone , I can see 1 branch locally: $ git branch * experiment So I did git checkout -b master origin/master to create my local tracking branch, now: $ git branch experiment * master Now I thought I'm having 2 local branches, so I happily launch gitk ,

I get the following error when I try to run gitk on macOS Mojave (10.14.4): Error in startup script: file:///System/Library/ScriptingDefinitions/CocoaStandard.sdef:2: I/O warning : failed to load external entity "file://localhost/System/Library/DTDs/sdef.dtd" <!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd"> ^ file:///System/Library/PrivateFrameworks/FolderActionsKit.framework/Versions/A/Resources/FolderActions.sdef:2: I/O warning : failed to load external entity "file://localhost/System/Library/DTDs/sdef.dtd" <!DOCTYPE dictionary SYSTEM "file://localhost/System

I have Git for Windows installed. When I right click on a project and select Git History I get the Gitk window, but every time I do so I need to set the view to see all branches. Even when I edit the view and set it to Remember , I still do not get all branches on subsequent visits to Gitk. Alternatively, I can open the Bash window and type gitk --all for the same result. Both are inconvenient and I'd like to make the default behavior of rght clicking and selecting Git History to show gitk --all . How can this be accomplished? Thanks. Modify registry of that context menu entry to add argument

Just gitk or gitk --all can try to fill up all memory on big repository. I know than I can gitk -n 1000 to limit it. Also I can killall git (or even Alt+SysRq+F if haven't stopped it in time) to stop it in middle of thrashing. Is there more proper way to make gitk don't load more commits and stop it's git subprocess without hacks or lengthy gitk restart? You can also limit gitk by branchname. Instead of using gitk --all to see all branches, just use 'gitk branchname'. This might limit the range of commits. 来源： https://stackoverflow.com/questions/5249851/gitk-how-to-tell-it-stop-dont-load-more

I want to show only my commits in gitk. I try to use the command gitk --author="Eugeniy Maksimov" <path> gitk shows not only my commits, but also theirs parents. Why? How to avoid this? 来源： https://stackoverflow.com/questions/49219779/how-to-avoid-showing-parent-commits-in-gitk-when-filtering-by-author

Environment: Mac OSX 10.10. When I was trying to use gitk , it shows: Coda-2:~ Coda$ gitk -bash: gitk: command not found I think the reason is the old version of git . Here is some information, and I have already typed brew update . Coda-2:~ Coda$ git --version git version 1.9.3 (Apple Git-50) Coda-2:~ Coda$ brew install git Warning: git-2.4.0 already installed, it's just not linked What is this message: it's just not linked ? Furthermore, I check the path of git : Coda-2:~ Coda$ which git /usr/bin/git It should be in /usr/bin/local/git ? How to fix it? UPDATE I figure it out, thank