Re: [git-users] Re: unable to reset working copy changes
On Sun, 19 Apr 2015 15:04:26 -0700 (PDT) Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Hi, I am unable to reset my working copy changes. I have two files in this project which differ only in their case: listwise/liblistwise/op/c/c.c listwise/lblistwise/op/C/C.c It appears that git is being confused by the similar file names. Is this a bug? todd@HOSSBEAST /q/Code/fab (master) $ git version git version 1.9.5.msysgit.1 I'm assuming you're on Windows since you use a Git built with msysgit. Windows does not have a case-sensitive file-system. Nit-picking a bit, NTFS is case-preserving but case-insensitive. That is, given the right tools, it is actually possible to rename foo to fOO, and the name will be stored as fOO (no case conversion is done). But yes, when matching a file name against the entries of the directory it's located in, NTFS performs case-insensitive comparison. AFAIK, HFS on Mac OS X exhibits the same behaviour. [...] If you are in control of this repository, I would heavily recommend changing some naming conventions. Having multiple files with the same name is asking for trouble and confusion. Absolutely! -- 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/d/optout.
[git-users] how to --since and --until get the expected git log
lyang001@lyang001-OptiPlex-9010:~/stats/gitstats$ git log --pretty=format:'%ad %an' --date=short --since='2013-1-25' --until='2013-11-03' 2013-09-22 Alexander Strasser 2013-07-29 Heikki Hokkanen 2012-12-16 Andrey Devyatkin 2013-07-26 Heikki Hokkanen 2013-07-23 Heikki Hokkanen 2013-07-23 Stephen Gordon 2012-08-26 Sven van Haastregt- this is not what I wanted 2013-02-24 Heikki Hokkanen 2013-02-24 Heikki Hokkanen 2013-01-28 Ernesto Jiménez But I want to get the time only between '2013-1-25' and '2013-11-03', Is there a general way to remove them since I have may of this kind of unexpected results Lei -- 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/d/optout.
Re: [git-users] how to --since and --until get the expected git log
On Mon, 20 Apr 2015 15:37:22 +0800 lei yang yanglei.f...@gmail.com wrote: lyang001@lyang001-OptiPlex-9010:~/stats/gitstats$ git log --pretty=format:'%ad %an' --date=short --since='2013-1-25' --until='2013-11-03' 2013-09-22 Alexander Strasser 2013-07-29 Heikki Hokkanen 2012-12-16 Andrey Devyatkin 2013-07-26 Heikki Hokkanen 2013-07-23 Heikki Hokkanen 2013-07-23 Stephen Gordon 2012-08-26 Sven van Haastregt- this is not what I wanted 2013-02-24 Heikki Hokkanen 2013-02-24 Heikki Hokkanen 2013-01-28 Ernesto Jiménez But I want to get the time only between '2013-1-25' and '2013-11-03', Is there a general way to remove them since I have may of this kind of unexpected results --since and --until check their arguments against commit date while the format string you're passing to --pretty displays the author date. These two are different, because a commit might have both the author and committer. In the supposedly most common case, when you run `git commit` in your local repository to to commit the changes you've prepared and staged manually, the committer and the author are the same, and the dates are the same, too. But they do not have to be the same: the classic case when they're not is applying a patch / patch series prepared by, say, `git format-patch`. Cherry-picking is another example. In these cases, the author is whoever actually provided the piece of code (authored it) and the committer is whoever applied (integrated) the work of the author. I'd recommend you to get the SHA-1 name of that commit (add %h to your format string) and then run `git show` on that name to see what are the headers in that commit. -- 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/d/optout.
Re: [git-users] git stash merge
On Mon, 20 Apr 2015 09:24:39 -0700 (PDT) Pawel Por porpa...@gmail.com wrote: I've just upgraded the linux kernel git source tree and I want to pop my stashed work. I do the following: git stash pop and I got the following message: mm/Makefile: needs merge unable to refresh index I also tried: git stash pop --index How can I overcome this obstacle. I did git stash before git pull. Well, IMO `git stash pop` merely told you it detected a conflict when trying to apply what you've stashed. Your work tree is now in conflicting state, and the stash wasn't dropped. All you have to do is resolve the conflict by editing mm/Makefile and `git add`-ing it to the index. Use `git status` + `git diff` to verify your changes from the stash entry actually landed into the work tree. If you feel uneasy about merging the stashed change, create a branch out of it (`git stash branch`) and merge those changes by merging the new branch. -- 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/d/optout.
[git-users] git stash merge
Hi, I've just upgraded the linux kernel git source tree and I want to pop my stashed work. I do the following: git stash pop and I got the following message: mm/Makefile: needs merge unable to refresh index I also tried: git stash pop --index How can I overcome this obstacle. I did git stash before git pull. Thanks for help. -- 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/d/optout.
