On Sun, 9 Sep 2012, Marcin Cieslak wrote: > On Fri, 7 Sep 2012, Jon Trulson wrote: > >> On Fri, 7 Sep 2012, Marcin Cieslak wrote: >> >>> We need to have /usr/local as the proper >>> X11 prefix to start mwm and xterm >> >> Applied. > > Thanks! > > I have a git question here: > > My patch was 87ce24fc6ae07be01dd3bf9bd1ed569433654803 > with "Date: Fri, 7 Sep 2012 23:02:46 +0200" > but was stored in the master (unchanged) as > bd70163b09ff59331bceba9506c7cc51962571f1 with > "Date: Fri Sep 7 23:04:44 2012 +0200" > > which is the date of the email. Unfortunate > side effect is that my branch is "behind 1 ahead 1" > of master and the change needs to "merged" > according to git, producing additional 2 commits. > > Is this because of the default "git am" behaviour? > (see --ignore-date --commiter-date-is-author-date > in git-am(1))? >
I wouldn't think so, since this is how it's been working from the beginning... One possibility: [apply] whitespace = fix I have this in my .git/config, so that whitespace errors (one or more spaces on an empty line, one or more spaces at the end of a line, etc) are 'fixed', which could alter the patch I suppose... But, I've also been doing this for the last few weeks too. Is it possible that it's caused by a failure to pull before making the change/commit? What two 'new' commits were created? -- Jon Trulson Atoms are what make us matter. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
