Re: [git-users] How to use git for web site development

2015-07-02 Thread JokeTube.TV
Title: Re: [git-users] How to use git for web site development Thanks for your help Gergely! 1) Do you mean use manual tracking or is there any automatic ways to do that? 2) Features could be added only when I have something but what should I do before? Someone suggested to do everything in

Re: [git-users] Keeping history migrating .java to .scala

2015-07-02 Thread Magnus Therning
On Wed, Jul 01, 2015 at 07:49:45AM -0700, Oliver Schrenk wrote: I want to migrate some legacy java code to scala whilst keeping git history intact for each file. The idea was to do a very basic conversion first, just doing ssyntactical changes first and have git mark it only as a rename and go

Re: [git-users] Git diff problem with cvs $id$

2015-07-02 Thread Magnus Therning
On Wed, Jul 01, 2015 at 06:37:12AM -0700, Konrád Lőrinczi wrote: I have two branches and the only difference between them is the cvs $id$, which is expanded in one branch and not expanded in the other. Is there a way to show git diff as unchanged? Not out of the box. You could do some

Re: [git-users] question about merge commits

2015-07-02 Thread Magnus Therning
On Wed, Jul 01, 2015 at 01:47:15PM +, Nelson Efrain A. Cruz wrote: This happens depending on how the history of the repos has diverged. Basically when you make a pull you are doing a fetch and a merge in the background. So there are two types of merges, one of them ends with a commit merge

Re: [git-users] Git diff problem with cvs $id$

2015-07-02 Thread Konstantin Khomoutov
On Wed, 1 Jul 2015 06:37:12 -0700 (PDT) Konrád Lőrinczi klorin...@gmail.com wrote: I have two branches and the only difference between them is the cvs $id$, which is expanded in one branch and not expanded in the other. Is there a way to show git diff as unchanged? Also should not show

Re: [git-users] Why commit --fixup uses commit message instead SHA of original commit in resulting commit message?

2015-07-02 Thread Konstantin Khomoutov
On Wed, 1 Jul 2015 00:32:23 -0700 (PDT) Igor Deyashkin igor.deyash...@gmail.com wrote: Let i have these commits: * task #2850 * task #2850 - #2961 Then i fixuping last commit: git commit --fixup= * bfbfbfbf fixup! task #2850 * task #2850 *

Re: [git-users] Error when merging iscsi/nodes directory from linux to windows because of colon in filename

2015-07-02 Thread Konstantin Khomoutov
On Sat, 20 Jun 2015 10:07:17 +0200 Konrád Lőrinczi klorin...@gmail.com wrote: [...] As for the git sparse checkout it is a good idea, but I'm afraid, that if I ignore iscsi/nodes path, then this will be OK for Windows, but on Debian, in case of a data loss need of restore, these

Re: [git-users] How to use git for web site development

2015-07-02 Thread Gergely Polonkai
On 2 Jul 2015 08:42, JokeTube.TV m...@joketube.tv wrote: Thanks for your help Gergely! 1) Do you mean use manual tracking or is there any automatic ways to do that? However you can solve it. I work with the Django framework which provides automation for it. It's hard to make suggestions