Re: Wrong commit ?

2022-08-02 Thread Pavel Sanda
On Mon, Aug 01, 2022 at 06:18:53PM +0200, Jean-Pierre Chrétien wrote:
> >>$ git log
> >>commit 4c72d8aeac01c53e27732999108f249356e67c5c (HEAD -> master, 
> >>origin/master,
> >>origin/HEAD)

...

> What bugs me is the  (HEAD -> master, origin/master, origin/HEAD) part,
> which is not present usually.

It is present for me all the time. Pavel
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: Wrong commit ?

2022-08-01 Thread Jean-Pierre Chrétien

Le 31/07/2022 à 19:16, Kornel Benko a écrit :

Am Sun, 31 Jul 2022 18:48:01 +0200
schrieb Jean-Pierre Chrétien :


Dear Developers,

While committing a very minor change in the French UserGuide, I had a warning
about the fact that I was in "Detached HEAD mode".

I committed nevertheless, but I see in the log that there is something fishy:


$ git log
commit 4c72d8aeac01c53e27732999108f249356e67c5c (HEAD -> master, origin/master,
origin/HEAD)
Author: jpc 
Date:   Sun Jul 31 18:28:23 2022 +0200

  Info in French UserGuide

commit c04192526187c1b3bfe7d7dcabd9cd6c50084642
Author: Pavel Sanda 
Date:   Sun Jul 31 11:13:53 2022 +0200

  pyupgrade related fixes to python scripts #2.

  Patch from Jose.
  https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg21.html


Is my commit in the right place?

What should I do to return to normal behavior?
Should I run

$git switch -


Maybe
$ git checkout master
?


from what I understand from the inline explanations?



Looks OK here.

commit 4c72d8ae
Author: jpc 
AuthorDate: Sun Jul 31 18:28:23 2022 +0200
Commit: jpc 
CommitDate: Sun Jul 31 18:29:23 2022 +0200

 Info in French UserGuide




What bugs me is the  (HEAD -> master, origin/master, origin/HEAD) part, which is 
not present usually.


--
Jean-Pierre
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: Wrong commit ?

2022-07-31 Thread Kornel Benko
Am Sun, 31 Jul 2022 18:48:01 +0200
schrieb Jean-Pierre Chrétien :

> Dear Developers,
> 
> While committing a very minor change in the French UserGuide, I had a warning 
> about the fact that I was in "Detached HEAD mode".
> 
> I committed nevertheless, but I see in the log that there is something fishy:
> 
> 
> $ git log
> commit 4c72d8aeac01c53e27732999108f249356e67c5c (HEAD -> master, 
> origin/master, 
> origin/HEAD)
> Author: jpc 
> Date:   Sun Jul 31 18:28:23 2022 +0200
> 
>  Info in French UserGuide
> 
> commit c04192526187c1b3bfe7d7dcabd9cd6c50084642
> Author: Pavel Sanda 
> Date:   Sun Jul 31 11:13:53 2022 +0200
> 
>  pyupgrade related fixes to python scripts #2.
> 
>  Patch from Jose.
>  https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg21.html
> 
> 
> Is my commit in the right place?
> 
> What should I do to return to normal behavior?
> Should I run
> 
> $git switch -

Maybe
$ git checkout master
?

> from what I understand from the inline explanations?
> 

Looks OK here.

commit 4c72d8ae
Author: jpc 
AuthorDate: Sun Jul 31 18:28:23 2022 +0200
Commit: jpc 
CommitDate: Sun Jul 31 18:29:23 2022 +0200

Info in French UserGuide


pgpsI589IjD6V.pgp
Description: Digitale Signatur von OpenPGP
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Wrong commit ?

2022-07-31 Thread Jean-Pierre Chrétien

Dear Developers,

While committing a very minor change in the French UserGuide, I had a warning 
about the fact that I was in "Detached HEAD mode".


I committed nevertheless, but I see in the log that there is something fishy:


$ git log
commit 4c72d8aeac01c53e27732999108f249356e67c5c (HEAD -> master, origin/master, 
origin/HEAD)

Author: jpc 
Date:   Sun Jul 31 18:28:23 2022 +0200

Info in French UserGuide

commit c04192526187c1b3bfe7d7dcabd9cd6c50084642
Author: Pavel Sanda 
Date:   Sun Jul 31 11:13:53 2022 +0200

pyupgrade related fixes to python scripts #2.

Patch from Jose.
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg21.html


Is my commit in the right place?

What should I do to return to normal behavior?
Should I run

$git switch -

from what I understand from the inline explanations?

--
Jean-Pierre




--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel