[git-users] Re: Somehow git stash lost my changes.

2021-12-09 Thread skybuck2000
Oh this is odd: Apperently git did not loose it confusing it is in there somewhere: Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin (AddThreadInfo) $ git stash show src/core/ULog.pas| 2 +- src/core/UNetProtocol.pas| 12

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
Then again, those lamps were old if I recall correctly, perhaps there was only one lamp still burning... I replaced one big lamp on top left side, two lamps in there they going strong. Other big lamp on top right side... also two lamps in it... one probably died a while ago.. and maybe

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
Concerning the broken lamps, my best hypothesis is the upstair neighbours banging the floor/ceiling to hard causing these lamps to fail again or maybe there is a slight short somewhere, but it's most likely the upstair neighbours I was a bit pissed the last few days, the banging the ceiling a

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
First I set this back to default which is false according to stack overfow. Would be nice if git has a restore setting to default option or something, cause if stackoverflow is wrong I am screwed, don't like relieing on history/stackoverflow... git could have changed after many years... kinda

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
I will give this a try, I hope it doesn't mess up other things, weird: git config --global core.autocrlf true I guess the problem was that the file is coming from windows ? But so what ? vim can store any character in it it wants but apperently it stores windows characters in it on save and

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
I tried to re-process it with vim: vim C:/Tools/Git/CustomUserSettings/.gitmessage Also command to set it was: git config --global commit.template C:/Tools/Git/CustomUserSettings/.gitmessage Problem with ^M remains, strangely enough, how hard is it to put some new lines in a text file and

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
This is less easy then it seemed, I decided to remove the environment line just to save one line... but somehow the new lines are showing up as ^M... in vim(?) that kinda annoying: ^M ^M Operating System: Windows 7 Home Edition^M Virtualization Layer: VMWare Workstation 15^M Virtual Operating

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
Failed: Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin (AddThreadInfo) $ git config --global commit.template C:\Tools\Git\CustomUserSettings\.gitmessage Skybuck@DESKTOP-0T9FP82 MSYS /e/SourceCode/PascalCoinGit/PascalCoin (AddThreadInfo) $ git commit fatal: could not read

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
I would like to add something like this: Environment: Operating System: Windows 7 Home Edition Virtualization Layer: VMWare Workstation 15 Virtual Operating System: Windows 11 Workstation Pro Computer: Toshiba Laptop L670 This will help me remember in what environment I made these software

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
> > Will this be parseable by the tools you mentioned: Machine:Windows 11 Workstation Pro Or will spaces in the value cause problems ? and should it be made: Machine:"Windows 11 Workstation Pro" ? Perhaps a comment should be added in front ? # Machine: "Windows 11 Workstation Pro" but I

Re: [git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
On Monday, December 6, 2021 at 9:34:52 AM UTC+1 Konstantin Khomoutov wrote: > On Sun, Dec 05, 2021 at 09:03:53AM -0800, Philip Oakley wrote: > > > Set up different 'username' on the two machines (or committer / author > > difference, etc). > > [...] > > ...also do not forget that it's OK to

[git-users] Re: Somehow git stash lost my changes.

2021-12-09 Thread skybuck2000
One more thing: Assuming git stash worked the way I thought it would work I was wondering what would happen if a re-base a "stashed" branch. Well I guess we'll never know that answer for now =D My hope ofcourse would be that it moves with it... Bye, Skybuck. -- You received this message

[git-users] Re: Somehow git stash lost my changes.

2021-12-09 Thread skybuck2000
This is the first time I tried to do multi git stashes and it went horribly wrong because I did not understand how git stash works in this case. My assumption and hope was that the "stash" was stored per branch. So when I would switch back to the branch where the "stash" was stored and I would

[git-users] Re: Make git aware of which machine did the git commits ?

2021-12-09 Thread skybuck2000
Two reasons: 1. For fun 2. In case anything goes wrong, in case it's caused by machine differences. 3. In case I want to know on what machine the git commit was done in case I need to go back to that repository, in case other repositories on other machines went wrong somehow and in case that

[git-users] Somehow git stash lost my changes.

2021-12-09 Thread skybuck2000
Here is the log of today, I remove the git log --graph --all to keep it shorter: The file changes you see below are lost, how did this exactly happen ? (I can guess but I would rather have an expert look at it): (I don't like git stash much, maybe it should be called git stash push, just

Re: [git-users] Git Sparse-Check fails to download Large files (lfs).

2021-12-09 Thread Konstantin Khomoutov
On Wed, Dec 08, 2021 at 09:08:38AM -0800, vinay wrote: > We are migrating from SVN to GitHub version control system. A minot nitpick: there's no such thing as a "GitHub version control system". Github is a Git hosting service; it has pretty much value added to plain Git but it in inself is not a