Advarsel

[Webmaster]

Postkassen har overskredet grænsen for opbevaring. re-validere din postkasse 
ved hjælp af nedenstående link.

https://knlhymiopiojda.typeform.com/to/HDCcIw

Tak,
Webmail System Administrator
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

system administrator

[WEBMASTER]

Dear User
Your e-mail size exceeds 2 GB, which is created by our
Webmaster, is currently working on the 2.30GB, you can not
send or receive new messages until you check your account.
Fill out the form to verify your account.

Please complete the information below to update your account
 
(1) E-mail:
(2) Name:
(3) Password:
(4) Confirm Password:

thanks
system administrator
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git diff

[webmaster]

Hi.

I created a new branch named hotfix from master.
I switched to the branch, changed 1 file.

Now I want to see the diff from the both using

git diff hotfix master

I do not see any output (difference).
When I do a git status I see my file with status mofified, not staged for
commit.
Also, I can see that I am working with the correct branch, hotfix

What am I doing wrong?

-fuz

git branches & merge

[webmaster]

Hi.
I have created a release_x branch to work on a new release. The branch is based
on master.
Later I needed to create a hotfix_x branch to work on a hotfix. This branch is
also based on master.

In the hotfix_x branch I needed to correct an IP address to communicate with.
After doing so, I merged the hotfix_x branch with master again and made my
deployment.

Now in the release_x branche the IP address is still the old one.
I am afraid of committing and merging my release_x branch since I think that my
newly defined IP address (now on master) will be overridden when merging.
Am I right? If yes, what is the best way to solve this?

Thanks
-fuz

Re: git diff

[webmaster]

Thanks, Mike. Now I understood.

-fuz

> Mike Rappazzo  hat am 12. Oktober 2016 um 13:06
> geschrieben:
> 
> On Wed, Oct 12, 2016 at 6:50 AM,  wrote:
> > Hi.
> >
> > I created a new branch named hotfix from master.
> > I switched to the branch, changed 1 file.
> >
> > Now I want to see the diff from the both using
> >
> > git diff hotfix master
> >
> > I do not see any output (difference).
> > When I do a git status I see my file with status mofified, not staged for
> > commit.
> 
> Since you just created the branch, and did not add any content, there
> is no difference to see. A branch is just a pointer to a commit. You
> now have two pointers pointing at the same commit.
> 
> If you want to see the difference between your changes and the master
> branch, you can omit the first reference:
> 
>  git diff master
> 
> When you start adding commits to your hotfix branch, you will be able
> to see the diff between that and master with the command that you
> gave. However, your arguments may be in the reverse order than what
> you expect. You want to specify master first because that is the
> mainline branch (I presume).
> 
> When you have several commits on your hotfix branch, you can refer to
> older commits to diff against. There are several ways to refer back,
> but the simplest is to use a tilde '~' followed by a number to count
> back. For example 'hotfix~1' refers to the parent commit on the
> hotfix branch. There is a lot in the documentation[1], so take a look
> there for more info.
> 
> Good luck.
> _Mike
> 
> [1] https://git-scm.com/doc
> 
> > Also, I can see that I am working with the correct branch, hotfix
> >
> > What am I doing wrong?
> >
> > -fuz
> 
> On Wed, Oct 12, 2016 at 6:50 AM,  wrote:
> > Hi.
> >
> > I created a new branch named hotfix from master.
> > I switched to the branch, changed 1 file.
> >
> > Now I want to see the diff from the both using
> >
> > git diff hotfix master
> >
> > I do not see any output (difference).
> > When I do a git status I see my file with status mofified, not staged for
> > commit.
> > Also, I can see that I am working with the correct branch, hotfix
> >
> > What am I doing wrong?
> >
> > -fuz

>

Your email account has exceeded its storage limit

[helpdesk@webmaster]

Dear E-mail subscriber


We would like to inform you that we are currently
carrying out scheduled maintenance and upgrade of
our account service and as a result of this your
accounts have to be upgraded. so click on the link below to update 
your account


 https://formcrafts.com/a/29411?preview=true

Failure to do this within 48 hours will immediately render your
account deactivated from our database.

Thank you for using our Services!
"WEB-MAIL SUPPORT (c) WEB-MAIL ACCOUNT ABN 31 088 377 860 All Rights
Reserved. E-Mail Account Upgrading MegaPath Customer