Re: [git-users] re-use a branch after merge in master

[Gergely Polonkai]

Hello,

as branches are nothing more than pointers to commits, there is nothing
that can keep you from reusing their names. It may confuse other
developers, though, so if you are working in a tem, you may want to consult
them on this.

Best,
Gergely
On Mar 23, 2016 17:04,  wrote:

> Hi all,
>
> I'd like to know if it's possible to re-use a branch name after it has
> been merged into master.
>
> Here are the details of what I did :
> * creation of a personnal branch
>   git checkout -b fdn/myBranch
> * regular work with commits and push in fdn/myBranch
> * report work into master
>   git checkout master
>   git pull origin master
>   git checkout fdn/myBranch
>   git rebase master
>   git checkout master
>   git merge --no-ff fdn/myBranch
>
> I have new things to add in the project, do I have to create a new branch
> or is there any way to re-use fdn/myBranch ?
>
> Thanks for your help
> Fred
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] re-use a branch after merge in master

[Konstantin Khomoutov]

On Wed, 23 Mar 2016 09:04:45 -0700 (PDT)
frederic_dumou...@yahoo.fr wrote:

> I'd like to know if it's possible to re-use a branch name after it
> has been merged into master.
> 
> Here are the details of what I did :
> * creation of a personnal branch
>   git checkout -b fdn/myBranch
> * regular work with commits and push in fdn/myBranch
> * report work into master
>   git checkout master
>   git pull origin master
>   git checkout fdn/myBranch
>   git rebase master
>   git checkout master
>   git merge --no-ff fdn/myBranch
> 
> I have new things to add in the project, do I have to create a new
> branch or is there any way to re-use fdn/myBranch ?

Broadly speaking, yes.
But what exactly to do about it depends on how do you define "re-use".

If you intend to *continue* working on fdn/myBranch -- to add there
work which logically follows what's already there (and has been
integrated into "master" as well), -- then just do that: you will be
able to merge to "master" again any number of times.

If you intend to truly "re-use" the branch name in that its name is
used for some work unrelated to what's currently on the branch then
just reset that branch to a commit you want it to point at.

Say, you now want to "re-fork" your fdn/myBranch off a branch
"feauture"; then do this:

  git checkout -B fdn/myBranch feature

and do the work.  Note that if you have pushed your branch to some
remote "central" (backup or otherwise) repository, you'll need to
force-push it the next time (use the "-f" command-line option when
calling `git push`) because this branch now contains the history
unrelated to its replica created/updated by former pushes.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[git-users] core.ignorecase no longer set for Windows setup

[Yves Goergen]

I noticed in a new test installation in a clean Windows 10 environment that 
Git 2.7.4 does not set the "core.ignorecase" setting to true anymore. This 
is the case in previous environments. As far as I could find out the 
default value for this option is false which will cause all kinds of 
trouble on Windows systems. (At least it did really bad things long time 
ago.)

What is the background of this change; do I have to set it manually 
everywhere or is Git smart enough to assume it's true when running on 
Windows? Or is my observation (running git config -l) wrong and it may be 
set actually?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] core.ignorecase no longer set for Windows setup

[Konstantin Khomoutov]

On Wed, 23 Mar 2016 05:57:59 -0700 (PDT)
Yves Goergen  wrote:

> I noticed in a new test installation in a clean Windows 10
> environment that Git 2.7.4 does not set the "core.ignorecase" setting
> to true anymore. This is the case in previous environments. As far as
> I could find out the default value for this option is false which
> will cause all kinds of trouble on Windows systems. (At least it did
> really bad things long time ago.)
> 
> What is the background of this change; do I have to set it manually 
> everywhere or is Git smart enough to assume it's true when running on 
> Windows? Or is my observation (running git config -l) wrong and it
> may be set actually?

Consider opening an issue in the project's tracker [1] or asking on its
mailing list [2].

1. https://github.com/git-for-windows/git/issues/
2. https://groups.google.com/forum/#!forum/git-for-windows

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] May I please have help understanding my stupid git mistake?

[Gergely Polonkai]

Hello,

unless you used the infamous force push (git push -f) you have nothing to
worry about. Push will refuse to work if the remote and local repos have
diverged.

Best,
Gergely
On Mar 23, 2016 5:38 AM, "heniser"  wrote:

> I've done something really stupid to my git public repository.
>
> https://bitbucket.org/ryanheniser/alshaders/commits/branch/ids
>
> Now, I am uncertain what to do next, if anything. From what I gather from
> that day and the repository:
>
> Instead of moving my local repositories, I mistakenly copied it to a new
> location on my hard drive. In that new location on my hard drive, I pushed
> my commits to origin (g...@bitbucket.org:ryanheniser/alshaders.git). I got
> interrupted by a phone call--I forgot that I had copied/moved the repro and
> that I had pushed to origin. So, I stupidly pushed to origin from the old
> location.
>
> All the git literature (I recall) says one should not rewrite history on
> public repositories; So, I just live with this, right? Is it going to hurt
> anything/anyone?
>
> Kind Regards,
> Ryan
>
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.