gitk

Starting gitk Error

╄→гoц情女王★ 提交于 2019-12-23 09:32:22
问题 When I'm loading gitk I get an error about an argument Error in startup script: bad argument "zoomed": must be normal, iconic, or withdrawn while executing "wm state . $geometry(state)" (procedure "makewindow" line 320) invoked from within "makewindow" (file "/usr/local/git/bin/gitk" line 11250) Anybody knows a solution? I'm working on Mac OS X 10.6.3 thx! 回答1: As mention in this blog post: 使用Macport安裝mercurial結果安裝了一堆相依的library,結果造成gitk不能執行 Err... I meant: The results using Macport

gitk equivalent of git log --follow <full path to file>

非 Y 不嫁゛ 提交于 2019-12-23 06:44:08
问题 So I have a file called one.txt that I have been modifying over the years on master branch. gitk one.txt will show the entire history of that one particular file. However after I changed one.txt => two.txt , gitk two.txt doesn't show any change before the rename. I tried gitk --follow two.txt , but only gave the comment for each commit, but not the actual file change information. I know I can do git log --follow two.txt , but you have to gitk each SHA1 value to each what is being changed. So

gitk: How to tell it “stop, don't load more commits”?

雨燕双飞 提交于 2019-12-21 12:08:08
问题 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? 回答1: You can also limit gitk by branchname. Instead of using gitk --all to see all branches, just use 'gitk branchname'. This might limit

How do I see a commit's path through git history, or “how it got in the current branch”?

我是研究僧i 提交于 2019-12-20 14:57:09
问题 I'm looking in the commit history using gitk and git log and I'm trying to see how a specific commit arrived in a certain branch. I can see the commits in the history, so I know they are there. What I want to understand is how they got merged (they were supposed to remain on their own branch). This is a very large project and there are hundreds of commits between the commit in question and the current state of the branch, so I cannot clearly decipher through the limited DAG in gitk , and the

How do I see a commit's path through git history, or “how it got in the current branch”?

强颜欢笑 提交于 2019-12-20 14:55:55
问题 I'm looking in the commit history using gitk and git log and I'm trying to see how a specific commit arrived in a certain branch. I can see the commits in the history, so I know they are there. What I want to understand is how they got merged (they were supposed to remain on their own branch). This is a very large project and there are hundreds of commits between the commit in question and the current state of the branch, so I cannot clearly decipher through the limited DAG in gitk , and the

Using gitk to view the full history of a moved file

余生长醉 提交于 2019-12-20 12:08:25
问题 After much searching, I have not found a satisfactory method that is easy to use to view the complete history of a moved file in Git and more importantly in Gitk. Using git log --follow [filePath] and even gitk --follow [filePath] gives you the commits that the file was involved in but will not show you the actual change history of the file before the move. I have thus come up with a crude but simple workaround solution. Do a gitk on the file that has been moved: gitk [newFilePath] . Copy the

Using gitk to view the full history of a moved file

帅比萌擦擦* 提交于 2019-12-20 12:08:08
问题 After much searching, I have not found a satisfactory method that is easy to use to view the complete history of a moved file in Git and more importantly in Gitk. Using git log --follow [filePath] and even gitk --follow [filePath] gives you the commits that the file was involved in but will not show you the actual change history of the file before the move. I have thus come up with a crude but simple workaround solution. Do a gitk on the file that has been moved: gitk [newFilePath] . Copy the

Can gitk show the diff of merges by default?

▼魔方 西西 提交于 2019-12-18 03:32:57
问题 Currently for merges without conflicts gitk shows no diffs. Is it possible to have the diffs resulting from a merge (which are indeed there, e.g. git diff HEAD~1 after the merge shows these diffs) shown by defautl, e.g. using a command line switch? Or why does gitk by default not show them? 回答1: By default gitk does the same thing as the --cc option to git diff and compresses the merge to only show diff chunks that don't come directly from one or other parent. This is usually more helpful as

Git: Compare All Local Commits to Remote Repo Version

让人想犯罪 __ 提交于 2019-12-18 01:29:07
问题 I'm somewhat new to Git and what I'm trying to do seems like it should be possible. Basically I've been working off of clone of a repo and have made quite a few local commits. Is there a way to see the diff of the 'sum' of all my changes and the original repo version? I would assume this would be possible because Git will essentially do this when I do a push . Here is an example of what I'm trying to do: in gitk I will see something like this: * - [mybranch] Added '42' to end of answers.txt

Viewing full version tree in git

扶醉桌前 提交于 2019-12-17 08:01:53
问题 I am using the command line version of Git and gitk. I want to see the full version tree, not just the part that is reachable from the currently checked out version. Is it possible? 回答1: You can try the following: gitk --all You can tell gitk what to display using anything that git rev-list understands, so if you just want a few branches, you can do: gitk master origin/master origin/experiment ... or more exotic things like: gitk --simplify-by-decoration --all 回答2: if you happen to not have a