[git-users] How to diff two file revisions with the mouse (with gitk)
Hi all: I would like to start gitk, select with the mouse 2 revisions of some file and then compare them, hopefully with an external diff tool, very much like I am used to with WinCVS. The closest I got is to start gitk with a filename as an argument, in order to restrict the log to that one file. Then I right-click on a commit (a file revision) and choose Mark this commit. However, if I right-click on another commit and choose Compare with marked commit, I get a full commit diff with all files, and not just the file I specified on the command-line arguments. Selecting a filename in the Tree view and choosing Highlight this only, as I found on the Internet, does not seem to help. I have git 1.7.9 (on Cygwin). Can someone help? By the way, it would be nice if gitk could launch the external diff tool from the Compare with marked commit option too. Thanks in advance, rdiez -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Does git allow to delete objects, found in a reference repository?
From: Ivan L abys...@gmail.com How can I delete from my repos the git objects that have appeared in the cache repo? - The remote repo is a very huge one, and I don't want to waste my space. If there is no such ability, then how can I report it as a feature-request to the git development team? As I understand it, you can reduce the size of a repository by removing from it branch names and tag names that you do not need, then running git gc to purge from the repository objects that no longer have a named reference to them. What you cannot do is remove any of the history of any branch whose head you want to have in the repository -- every commit reqires the presence of its predecessor commit(s). There are probably advanced techniques that get around the latter restriction, but I don't know what they are. Dale -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Why Same Files show up with different Statuses in Git?
From: Matthew Johnson mejoh...@gmail.com Under Windows (cygwin) git status shows nothing to commit, only untracked files, which is what I expect; only under F17 do I get several modified files -- and these have old dates (e.g. Nov 27). My guess is that it has something to do with line-endings or some subtlety about how file modification times are handled. Under F17, when you do a git diff, what differences does it display? Dale -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: missing Git configuration files
Hi, I don't have an /etc/gitconfig on Ubuntu and I can't remember if a .gitconfig was created in my home directory, I don't think it was. You'll soon have a .gitconfig file once you start setting properties via git config --global as Git will create the file for you. I think you'll most definitely have to configure your name and email in Git so you'll end up with a .gitconfig file soon enough. HTH On Wednesday, 30 January 2013 19:17:25 UTC, automatix wrote: Hello! Reading Progit (1.5 Getting Started - First-Time Git Setuphttp://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup )... /etc/gitconfig file: Contains values for every user on the system and all their repositories. If you pass the option--system to git config, it reads and writes from this file specifically. I've just instaled Git on my (Debian 64bit) VM, but there is neither /etc/gitconfig file, nor a .gitconfig file in my user home directory. Perhaps something went wrong, when Git was being installed? Thx -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: missing Git configuration files
OK, the files have been added automatically, after I had defined the first configs. Am Mittwoch, 30. Januar 2013 20:17:25 UTC+1 schrieb automatix: Hello! Reading Progit (1.5 Getting Started - First-Time Git Setuphttp://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup )... /etc/gitconfig file: Contains values for every user on the system and all their repositories. If you pass the option--system to git config, it reads and writes from this file specifically. I've just instaled Git on my (Debian 64bit) VM, but there is neither /etc/gitconfig file, nor a .gitconfig file in my user home directory. Perhaps something went wrong, when Git was being installed? Thx -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Why Same Files show up with different Statuses in Git?
I think this question on stackoverflow might help... - http://stackoverflow.com/questions/170961/whats-the-best-crlf-handling-strategy-with-git Basically the problems stems to you using the same physical repo with two different types of Git client, one built to use Windows EOL and the other using Linux EOL. When you mix the two, I.e. work with a file in Linux when it was created whilst on Windows I think you'll run into problems. I think if you set up the Windows client correctly (or specifically use the .gitattributes file for the repository) I *think* you'll be ok. HTH On Wednesday, 30 January 2013 02:40:47 UTC, Matthew Johnson wrote: I hate to cross post, but I can no longer see my message to the same effect at the Git mailing list, where I got no reply, so here we go: First, some background. I have one hard disk separated into two partitions: one for the version of Windows 7 that shipped on this rather new Thinkpad (Windows 7 Professional SP1), the other for Fedora 17 (which I installed and keep up-to-date). Of course, it is rather easy to access the Windows partition from the F17 partition, which I have been doing with no noticeable problems: the File Explorer equivalent, Dolphin (the KDE equivalent) will automount the Windows partition as a filesystem under /media, I only have to enter the password for 'su'. I don't think it makes a difference, but for completeness I provide the options with which I find it mounted: /dev/sda2 on /media/Windows7_OS type fuseblk (rw,nosuid,nodev,relatime, user_id=0,group_id=0,default_permissions,allow_other,blksize=4096). Anyway, the problem is this: the very same files, e.g. /media/Windows7_OS/cygwin/home/Matthew Johnson/MrEd/mr.ed/lesson1/images/home-icon.jpg show up as 'modified' when I type git status (in the mr.ed/ dir) using the F17 git client, but do not show up at all when I type git status under the Cygwin client. This problem is not on all files, only a few, predominantly in two directories. Under Windows (cygwin) git status shows nothing to commit, only untracked files, which is what I expect; only under F17 do I get several modified files -- and these have old dates (e.g. Nov 27). Yes, that is another important note: I am running Cygwin on the Windows partition. The versions of things under the F17 partition are: Linux 3.7.3-101.fc17.x86_64 x86_64 System: Fedora release 17 (Beefy Miracle) KDE: 4.9.5 git --version git version 1.7.11.7 Under Cygwin, the git version is 1.7.9. Finally, I did check the git configuration to make sure the same user.name and user.email are set in both. And in both cases, I made mr.ed the current directory before executing git status. Shouldn't that be enough? Is there anything else that must match in the git config? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Why Same Files show up with different Statuses in Git?
Good guess, I had not been thinking about the different EOLs, but all the files that show up as modified only under Fedora are .ogg files: no EOLs at all. Even weirder, the textual files, whether HTML or JavaScript, do not have this problem. So it is hard to see how EOL inconcistency could explain why sound files are showing up as modified. On Wednesday, January 30, 2013 11:30:28 AM UTC-8, Alex Lewis wrote: I think this question on stackoverflow might help... - http://stackoverflow.com/questions/170961/whats-the-best-crlf-handling-strategy-with-git Basically the problems stems to you using the same physical repo with two different types of Git client, one built to use Windows EOL and the other using Linux EOL. When you mix the two, I.e. work with a file in Linux when it was created whilst on Windows I think you'll run into problems. I think if you set up the Windows client correctly (or specifically use the .gitattributes file for the repository) I *think* you'll be ok. HTH On Wednesday, 30 January 2013 02:40:47 UTC, Matthew Johnson wrote: I hate to cross post, but I can no longer see my message to the same effect at the Git mailing list, where I got no reply, so here we go: First, some background. I have one hard disk separated into two partitions: one for the version of Windows 7 that shipped on this rather new Thinkpad (Windows 7 Professional SP1), the other for Fedora 17 (which I installed and keep up-to-date). Of course, it is rather easy to access the Windows partition from the F17 partition, which I have been doing with no noticeable problems: the File Explorer equivalent, Dolphin (the KDE equivalent) will automount the Windows partition as a filesystem under /media, I only have to enter the password for 'su'. I don't think it makes a difference, but for completeness I provide the options with which I find it mounted: /dev/sda2 on /media/Windows7_OS type fuseblk (rw,nosuid,nodev,relatime, user_id=0,group_id=0,default_permissions,allow_other,blksize=4096). Anyway, the problem is this: the very same files, e.g. /media/Windows7_OS/cygwin/home/Matthew Johnson/MrEd/mr.ed/lesson1/images/home-icon.jpg show up as 'modified' when I type git status (in the mr.ed/ dir) using the F17 git client, but do not show up at all when I type git status under the Cygwin client. This problem is not on all files, only a few, predominantly in two directories. Under Windows (cygwin) git status shows nothing to commit, only untracked files, which is what I expect; only under F17 do I get several modified files -- and these have old dates (e.g. Nov 27). Yes, that is another important note: I am running Cygwin on the Windows partition. The versions of things under the F17 partition are: Linux 3.7.3-101.fc17.x86_64 x86_64 System: Fedora release 17 (Beefy Miracle) KDE: 4.9.5 git --version git version 1.7.11.7 Under Cygwin, the git version is 1.7.9. Finally, I did check the git configuration to make sure the same user.name and user.email are set in both. And in both cases, I made mr.ed the current directory before executing git status. Shouldn't that be enough? Is there anything else that must match in the git config? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Why Same Files show up with different Statuses in Git?
Please explain why I would need a third partition to do this. I am not aware of any restrictions in Git concerning what machine/partition the workspace and repository must live on, except that the remote is expected to really be remote, i.e., not on the local machine, accessible only over the net, whether via git:// scheme or some other. And why would files be changed when you jump back and forth? If both the workspace and repository are one and the same partition, why would it make any difference which filesystem it is mounted on or accessed from? The same .git files are being read, the same submitted files, etc. BTW: I am trying to do both the things you mention: keep one work area I can use from either Windows or Linux and keep a remote repo I can get to from both (upstream). The latter is already achieved, it is the first that is giving me strange discrepancies concerning which files are modified. Because of this discrepancy, though I continue to edit files running either Windows or Fedora, I do the revision control only while running Windows. But this is far from ideal, especially when it looks like I am so close to getting the ability to run Git correctly from either. BTW: the remote repository is at Github. But since I am so underwhelmed by their GUI, I stick to command line Git whenever possible: the Git documentation is good enough that I have a much better idea what is really going on when I execute a Git command on the command line, despite the problem I am having with these dubious 'modified' reports. On Wednesday, January 30, 2013 9:24:26 AM UTC-8, John Fisher wrote: Matthew, I defer to actual Git experts... but heres some sysadmin ideas: Are you trying to keep one work area you can use for Windows and for Linux? Or are you trying to keep a remote repos which you can get to from both? If you create a third partition and put your Git workarea and repository there, then you could mount it from both Windows and Linux. But files are going be changed when you jump back and forth. You could also switch to running Linux, and put up a VM of Windows ( or vice versa) and have both running at once, keeping your remote repos on Linux and having two work areas. Or, you could get that old Pentium4/ Pentium/ AMD dog out of the closet or for $25 at the thrift store, and set up a Linux server with a remote repository. Or you could host your project at github. John On Tuesday, January 29, 2013 6:40:47 PM UTC-8, Matthew Johnson wrote: First, some background. I have one hard disk separated into two partitions: one for the version of Windows 7 that shipped on this rather new Thinkpad (Windows 7 Professional SP1), the other for Fedora 17 (which I installed and keep up-to-date). Of course, it is rather easy to access the Windows partition from the F17 partition, which I have been doing with no noticeable problems: -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Why Same Files show up with different Statuses in Git?
What differences does it display? It lists about a hundred .ogg files (like the one I included) as 'modified'. I did not want to burden the group with the whole list, so I mentioned only one .ogg file. But here are the first few lines, which include ogg, jpb, and png files: [mejohnsn@localhostThinkpad mr.ed]$ git status # On branch master # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # # modified: fix_ogg.py # modified: lesson1/images/home-icon.jpg # modified: lesson1/images/home-icon.png # modified: lesson1/images/left-arrow.png # modified: lesson1/images/right-arrow.png # modified: lesson2/images/home-icon.jpg # modified: lesson3/images/home-icon.jpg # modified: lesson3/lesson_a/images/home-icon.jpg # modified: lesson3/lesson_a/sounds/1.ogg # modified: lesson3/lesson_a/sounds/10.ogg ... It even includes one Python file I forgot to mention since I have no intention of checking it into the repository;) None of these show up as modified when I type the same git status in a Cygwin command line. On Wednesday, January 30, 2013 8:21:37 AM UTC-8, Dale Worley wrote: From: Matthew Johnson mejo...@gmail.com javascript: Under Windows (cygwin) git status shows nothing to commit, only untracked files, which is what I expect; only under F17 do I get several modified files -- and these have old dates (e.g. Nov 27). My guess is that it has something to do with line-endings or some subtlety about how file modification times are handled. Under F17, when you do a git diff, what differences does it display? Dale -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Why Same Files show up with different Statuses in Git?
Just out of curiosity, what you have as filemode configuration? Maybe if you do $git config core.filemode false the files will no longer show as modified? 31 януари 2013, четвъртък, 03:40:58 UTC+2, Matthew Johnson написа: What differences does it display? It lists about a hundred .ogg files (like the one I included) as 'modified'. I did not want to burden the group with the whole list, so I mentioned only one .ogg file. But here are the first few lines, which include ogg, jpb, and png files: [mejohnsn@localhostThinkpad mr.ed]$ git status # On branch master # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # # modified: fix_ogg.py # modified: lesson1/images/home-icon.jpg # modified: lesson1/images/home-icon.png # modified: lesson1/images/left-arrow.png # modified: lesson1/images/right-arrow.png # modified: lesson2/images/home-icon.jpg # modified: lesson3/images/home-icon.jpg # modified: lesson3/lesson_a/images/home-icon.jpg # modified: lesson3/lesson_a/sounds/1.ogg # modified: lesson3/lesson_a/sounds/10.ogg ... It even includes one Python file I forgot to mention since I have no intention of checking it into the repository;) None of these show up as modified when I type the same git status in a Cygwin command line. On Wednesday, January 30, 2013 8:21:37 AM UTC-8, Dale Worley wrote: From: Matthew Johnson mejo...@gmail.com Under Windows (cygwin) git status shows nothing to commit, only untracked files, which is what I expect; only under F17 do I get several modified files -- and these have old dates (e.g. Nov 27). My guess is that it has something to do with line-endings or some subtlety about how file modification times are handled. Under F17, when you do a git diff, what differences does it display? Dale -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
