Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-14 Thread Philip Oakley
- a bit late in providing a comment.. From: "Michael J Gruber" Ævar Arnfjörð Bjarmason venit, vidit, dixit 12.04.2017 14:18: On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber wrote: Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason"

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 12, 2017 at 3:11 PM, Michael J Gruber wrote: > Ævar Arnfjörð Bjarmason venit, vidit, dixit 12.04.2017 14:18: >> On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber wrote: >>> Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" >>>

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Michael J Gruber
Ævar Arnfjörð Bjarmason venit, vidit, dixit 12.04.2017 14:18: > On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber wrote: >> Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" >> : >>> On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu HEAD

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber wrote: > Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" > : >>On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu >>> HEAD detached from origin/master 1 commit ago, >> >>In lieu of that, which

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Michael J Gruber
Enis Bayramoğlu venit, vidit, dixit 12.04.2017 08:15: > On Wed, Apr 12, 2017 at 8:43 AM, Michael J Gruber wrote: >> Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" >> : >>> On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu >>>

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Enis Bayramoğlu
On Wed, Apr 12, 2017 at 8:43 AM, Michael J Gruber wrote: > Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" > : >>On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu >> wrote: Well, what do you suggest as an

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Michael J Gruber
Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" : >On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu > wrote: >>> Well, what do you suggest as an alternative? >>> >>> Git tells you that you are in detached state and where you came from

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu wrote: >> Well, what do you suggest as an alternative? >> >> Git tells you that you are in detached state and where you came from >> (detached from). > > I think it'd be best if git status somehow indicated that you're no >

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Enis Bayramoğlu
> Well, what do you suggest as an alternative? > > Git tells you that you are in detached state and where you came from > (detached from). I think it'd be best if git status somehow indicated that you're no longer at the same commit. Maybe something like: $ git status HEAD detached from

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Michael J Gruber
Enis Bayramoğlu venit, vidit, dixit 11.04.2017 10:57: > I've encountered a very misleading output from `git status`. Here's a > sequence of events that demonstrates the issue: > > $ git --version > git version 2.12.0 > > $ git checkout origin/master > > $ git status > HEAD detached from

`git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Enis Bayramoğlu
I've encountered a very misleading output from `git status`. Here's a sequence of events that demonstrates the issue: $ git --version git version 2.12.0 $ git checkout origin/master $ git status HEAD detached from origin/master nothing to commit, working directory clean $ git merge --ff