gitk

How does “index f2e4113..d4b9bfc 100644” in git diff correspond to SHA1 ID in gitk?

怎甘沉沦 提交于 2019-12-03 05:04:41
What does 'index f2e4113..d4b9bfc 100644' mean in the output from git diff? Till now I have assumed that these SHA1 ID's are from_version..to_version, but I can't find them in gitk. $ git --version git version 1.8.3.4 $ git diff ae1fdc1 diff --git a/README b/README index f2e4113..d4b9bfc 100644 --- a/README +++ b/README @@ -1 +1,3 @@ stuff +more +more stuff 'index f2e4113..d4b9bfc 100644' doesn't look like a part of diff unified format. http://en.wikipedia.org/wiki/Diff#Unified_format 100644 looks like a file mode, but doesn't correspond to the mode of the README file (660). f2e4113..d4b9bfc

How to copy text in gitk

和自甴很熟 提交于 2019-12-03 05:02:34
Can I copy source code in the left-bottom panel in gitk? Any keyboard shortcut or other functions? OS: Ubuntu 9.04 Desktop / gitk: 1:1.6.0.4-1ubuntu2 Thank you. Mark Mussetter Workaround: Right-click on the source code you want to copy. Select "Run git gui blame on this line." This opens up a new gui blame editor with full copy/paste functionality. It should support the (X clipboard style) copy, even though a bug has been reported for that feature on Ubuntu: gitk supports the normal X clipboard: select to copy, middle-click to paste. My mouse does not have a middle button and select isn't

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

喜欢而已 提交于 2019-12-03 03:52:19
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 commit gets masked in other branches and merges and commit messages. To do this, I have been trying:

Can I add metadata to git commits? Or can I hide some tags in gitk

杀马特。学长 韩版系。学妹 提交于 2019-12-03 03:01:45
问题 I want to associate custom metadata with a git commit . Specifically to record a review ID from a code review but it could be anything. Tags seem a natural way to do that but I expect to have a review for every commit and I don't want to clutter gitk with tons of tags. Is there some other mechanism to add custom metadata? Can I make certain tags invisible? If I could tell gitk not to display tags matching some pattern or RE, that would likely work but I don't see a way to do that. 回答1: That's

Using gitk to view the full history of a moved file

一笑奈何 提交于 2019-12-03 01:28:36
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 SHA1 ID of the first commit, this should be the commit where the file has been moved. Do a gitk

Can I add metadata to git commits? Or can I hide some tags in gitk

ぐ巨炮叔叔 提交于 2019-12-02 16:35:06
I want to associate custom metadata with a git commit . Specifically to record a review ID from a code review but it could be anything. Tags seem a natural way to do that but I expect to have a review for every commit and I don't want to clutter gitk with tons of tags. Is there some other mechanism to add custom metadata? Can I make certain tags invisible? If I could tell gitk not to display tags matching some pattern or RE, that would likely work but I don't see a way to do that. That's precisely what git notes are for. Git-notes With git notes you can add a “note” to a commit. You can also

gitk: weird history tree

旧巷老猫 提交于 2019-11-30 18:59:05
I'm porting an svn repo to git (using svn2git from https://www.negativetwenty.net/redmine/projects/show/svn2git ) and since svn does not track merges, I need to edit .git/info/grafts manually. For this, I launch gitk, search for the term "Merge" in commit messages, verify that the merge commits have the right ancestry and populates .git/info/grafts acordingly. The issue I'm having is that gitk seems to be confused with the "master" branch. It often shows master being "forked" from a branch and being merged into a branch afterword, when actually it is the opposite. Why is it unable to

How to view complete commits when tracking history of a single file in Git?

喜你入骨 提交于 2019-11-30 11:08:44
I have a Git repository with about a two years of history in it. I have single file in it, for which I wish to find all the commits, and for each commit: all the other files that were committed in it. Let's assume this file is named file.txt. I can run gitk with this file as argument: gitk file.txt and I do get each commit. However, browsing that tree in gitk only shows changes done to file.txt. I'd like to see what other files were changed in that commit. I can copy paste each commit SHA1 and display it, but there are over hundred of commits related to this file. I notice that "comments"

gitk: weird history tree

三世轮回 提交于 2019-11-30 03:13:36
问题 I'm porting an svn repo to git (using svn2git from https://www.negativetwenty.net/redmine/projects/show/svn2git) and since svn does not track merges, I need to edit .git/info/grafts manually. For this, I launch gitk, search for the term "Merge" in commit messages, verify that the merge commits have the right ancestry and populates .git/info/grafts acordingly. The issue I'm having is that gitk seems to be confused with the "master" branch. It often shows master being "forked" from a branch and

gitk will not start on Mac: unknown color name “lime”

旧时模样 提交于 2019-11-29 19:38:41
I've installed git on a mac via brew install git . When I try to start gitk I get the following error: Error in startup script: unknown color name "lime" (processing "-fore" option) invoked from within "$ctext tag conf m2 -fore [lindex $mergecolors 2]" (procedure "makewindow" line 347) invoked from within "makewindow" (file "/usr/local/bin/gitk" line 12434) It appears that my Mac doesn't have a color named lime . Can I add a lime color to the environment, or is there a better fix? The git version is 2.7.0, and the Mac is running Yosemite 10.10.5 You can check your version of Tcl/Tk by running