Re: [git-users] Re: unable to reset working copy changes

2015-04-20 Thread Konstantin Khomoutov
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-users] how to --since and --until get the expected git log

2015-04-20 Thread lei yang
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

Re: [git-users] how to --since and --until get the expected git log

2015-04-20 Thread Konstantin Khomoutov
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

Re: [git-users] git stash merge

2015-04-20 Thread Konstantin Khomoutov
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

[git-users] git stash merge

2015-04-20 Thread Pawel Por
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