Yeesh. If I didn't use SmartGit I would hate Git so much. Takes all this crap off the table for me.
I use Git the same way I use SVN except there is staging and everything is way faster. Full fledged Git is so wild. On Thu, Feb 4, 2016 at 5:40 AM Uwe Schindler <[email protected]> wrote: > Hi, > > > And one more thing I was surprised by (and perhaps someone will tell > > me what I did wrong). When I "cherry picked" to backport to 5x, the > > CHANGES.txt file got all of the inclusions for 6.0 in it (on the 5x > > branch). So I hand-edited that puppy instead of cherry picking. > > Did not happen to me until now. It always only cherry-picked the changes > in the commit (just like in SVN). But I have done it using the Tortoise > GUI, which is really comfortable (checkout 5.x, go to "show log", on > top-left click on branch name and choose "master", right-click master > commit, choose cherry pick). > > Maybe it is related to rebasing? I refuse to do rebasing unless really > needed, so maybe I am on safe side - but my computer does not do it > "automatically" as suggested here :-) > > Uwe > > > > > FWIW > > [email protected] > > > > > > > > > > > > On Wed, Feb 3, 2016 at 7:02 PM, Dennis Gove <[email protected]> wrote: > > > The git url for committers is > > > https://git-wip-us.apache.org/repos/asf/lucene-solr.git which, to me, > > > implies that one would have to supply their uname/pw on each commit. > > With > > > svn we were using ssl keys. > > > > > > My understanding that to use ssl keys on git one has to use a url of > the > > > form [email protected]/repos/asf/lucene-solr.git (not sure > if this > > > is the right url, just showing the form) > > > > > > Is it possible for us to use ssl keys for commits to git or will it be > > > necessary to provide uname/pw each time? > > > > > > Thank, > > > Dennis > > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > -- - Mark about.me/markrmiller
