[git-users] Re: Git and Basic authentication

Hello again. It seems I found the answer to my question. Yes, really Git client requires 'WWW-Authenticate: Basic' when gets 401 response. Without this, Git won't send credentials. воскресенье, 15 октября 2023 г. в 12:24:13 UTC+3, Artem: > Hello everyone! > > I'm playing with the JGit library

Re: [git-users] Re: Git new branch listed in 'git branch' command only after 'git checkout '

On Fri, Sep 29, 2023 at 04:45:13AM -0700, Leonardo D'Alimonte wrote: > so basically the command "git branch" without params lists local branches > that are not yet checked out. This statement is a bit strange. A Git repository may only have a single branch checked out at any given time. The comm

[git-users] Re: Git new branch listed in 'git branch' command only after 'git checkout '

Hi Philip, so basically the command "git branch" without params lists local branches that are not yet checked out. What I actually didn't know is "-a" params which lists *all *branches, local and remotes included :) Thanks for your reply, as I'v learnt something new! Bye Leonardo On Thursday,

[git-users] Re: Git new branch listed in 'git branch' command only after 'git checkout '

I guess you haven't yet grasped the full effects of the decentralised nature of Git yet ;-) When you 'pull' you first 'fetch' the [selected branches of the] remote repository and store it under the remote's name (often 'origin'), so you get an 'origin/master' (as well as your own 'master'), and t

[git-users] Re: git - controlling user access to specific git repositories

Git itself is all about collaboration in an open source environment (cf Linux!) So any restrictions on access need to be implemented elsewhere, rather than Git itself. Access control is a big subject riddled with admin, political and corporate issues. In that sense, Git repos are 'just another

Re: [git-users] Re: `git gc` error: fatal: could not find pack

In further messing around, I lost one of the pack files. :( Now I'm re-cloning the repository from the remote. I'm keeping the old .git folder backed up, though, in case anyone has suggestions. On Mon, Jun 5, 2023 at 4:26 PM Lyndon Gingerich wrote: > `git verify-pack -v ` returns: > > fatal: Can

Re: [git-users] Re: `git gc` error: fatal: could not find pack

`git verify-pack -v ` returns: fatal: Cannot open existing pack file '.idx' : bad On Mon, Jun 5, 2023 at 3:54 PM Lyndon Gingerich wrote: > The packfile is only ~52kb, so its size is probably not an issue. > > I successfully ran `git gc` on two other repositories, so the issue is not > global. >

[git-users] Re: `git gc` error: fatal: could not find pack

The packfile is only ~52kb, so its size is probably not an issue. I successfully ran `git gc` on two other repositories, so the issue is not global. On Monday, June 5, 2023 at 3:48:03 PM UTC-5 Lyndon Gingerich wrote: > I discovered this problem from investigating the Git console in JetBrains >

[git-users] Re: Git log --reverse gives less results. Is it a bug?

Aha, I see. So, it's a known bug. Thanks! On Friday, May 5, 2023 at 4:56:20 PM UTC+2 philip...@iee.email wrote: > The `--reverse` problem pops up moderately often (OK occasionally). > Usually it's not doing what you expect as to _when_ the reversal is > applied. > > > https://stackoverflow.com

[git-users] Re: Git log --reverse gives less results. Is it a bug?

The `--reverse` problem pops up moderately often (OK occasionally). Usually it's not doing what you expect as to _when_ the reversal is applied. https://stackoverflow.com/questions/35379277/why-does-git-log-with-follow-and-reverse-return-only-last-commit On Friday, May 5, 2023 at 12:29:56 AM UT

[git-users] Re: Git rules not being ignored from file that itself is ignored

Reading the post, this might have been not quite what I wanted to describe, so I'll take another run at it, with this: Locally (not in the repo yet), I have the following files: README.md package.json src src/things1 src/things.ts src/.eslintrc.json src/thing1.js src/things1/.gitignore src/thing

Re: [git-users] Re: Git Business Model?

Hi Konstantin, Thank you so much for your answer! It's really clear now. Have a nice day, Sarah Le mer. 1 mars 2023 à 17:34, Konstantin Khomoutov a écrit : > On Wed, Mar 01, 2023 at 01:45:08AM -0800, 'Sarah GOMEY' via Git for human > beings wrote: > > Disclaimer (which might get a bit more obv

[git-users] Re: Git Business Model?

On Wed, Mar 01, 2023 at 01:45:08AM -0800, 'Sarah GOMEY' via Git for human beings wrote: Disclaimer (which might get a bit more obvious later on): I (and anyone else on this mailing list) do not "represent Git" in any way; anything written below is my personal opinion. > Hope this email finds you

Re: [git-users] Re: git gc error with git 2.37.2?

On Tue, Jan 10, 2023 at 01:22:13PM -0800, Paul Wagland wrote: > Did this patch ever end up getting merged in? I am seeing the problem again > in my repo with git 2.39.0, so was just wondering if this managed to make > it upstream [...] I think it did not manage to come through yet [1]. You migh

[git-users] Re: git gc error with git 2.37.2?

Hi Mathias, Did this patch ever end up getting merged in? I am seeing the problem again in my repo with git 2.39.0, so was just wondering if this managed to make it upstream Cheers, Paul On Wednesday, October 19, 2022 at 9:10:55 AM UTC+2 Paul Wagland wrote: > Thanks Mathias! > > This patch se

[git-users] Re: git gc error with git 2.37.2?

Thanks Mathias! This patch seems to have gained some traction as well, so I am glad that my pain lead to some improvement :-) Cheers, Paul On Tuesday, October 18, 2022 at 5:42:47 PM UTC+2 Mathias Rav wrote: > On Monday, October 17, 2022 at 8:27:44 PM UTC+2 Paul wrote: > >> Based on the above,

[git-users] Re: git gc error with git 2.37.2?

On Monday, October 17, 2022 at 8:27:44 PM UTC+2 Paul wrote: > Based on the above, I contacted the git list, and got a response from Jeff: > > It sounds like there's a resolve-undo extension in your index > that references that blob, but the blob was removed from the > repository (probably by a g

[git-users] Re: git should not allow commit while in middle of rebase

I use it often to split a complex commit into independent parts, maybe even make one of those parts be a `fixup! ` commit. If purposeful (first case) then you are already interactive and it feels sensible. If it was an 'automatic' rebase (non-interactive until conflict) then you may find you s

[git-users] Re: git gc error with git 2.37.2?

Hi Mathias, Based on the above, I contacted the git list, and got a response from Jeff: > It sounds like there's a resolve-undo extension in your index that references that blob, but the blob was removed from the repository (probably by a gc prior to 5a5ea141e7, which was trying to prevent this

[git-users] Re: git gc error with git 2.37.2?

Hi Mathias, I have not figured out a solution yet, I have just pinned my git to 2.37.1 and continued on, I haven't circled back to look at this yet. In the meantime 2.38.0 is also released, and that has the same issue for me. I did some further testing based on your feedback, and building git

[git-users] Re: git gc error with git 2.37.2?

On Friday, September 16, 2022 at 12:35:24 AM UTC+2 Paul wrote: > However, when I upgrade to git 2.37.2, or 2.37.3, git gc suddenly starts > to fail: > fatal: unable to read 1d0f34d1c4314efcff527847755e4ccc77d44fb6 > > fatal: failed to run repack > How can I work out what reference is causing this

[git-users] Re: git clone ssh key -i error

i, I use git 2.37 on Windows 10 and i have an problem with git clone ssh This command is Ok ssh g...@127.0.0.1 -v -p 2223 -i Z:\zpoubelle\tssh4\id_rsa But following command failed set GIT_SSH_COMMAND="ssh -p 2223-i Z:\zpoubelle\tssh4\id_rsa" git clone g...@127.0.

[git-users] Re: git fetch creates many threads

Hello is operating system thread No specific amount will be created if not manually terminated I have this problem on mac os or ubuntu mac os version 10.14 ubuntu 18.04 在2022年7月1日星期五 UTC+8 18:42:07 写道： > How many is lots? Is it a case of just using the available processor > threads, or is it hun

[git-users] Re: git fetch creates many threads

How many is lots? Is it a case of just using the available processor threads, or is it hundreds and thousands of OS threads? Some of the tasks can have elements that are run in parallel, so this might be part of it. Also do you have any of the File System monitor capability enabled (haven't l

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

GfW is an abbreviation for Git for Windows' - I think I'd introduced it earlier in one of the posts. The "Native" size for Windows, in backwards compatibility terms (which is at the "compiled binary" level") is 32 bits, i.e. old code runs without change. Hence the addition of "long long" by Micros

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

On Thursday, March 3, 2022 at 3:54:25 PM UTC+1 philip...@iee.email wrote: > > Am I correct in that the work to make mainline Git use size_t where > applicable > is ongoing? > > It's currently a little stalled, because it's been hard to partition the > problem into small chunks that fit every

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

On Thursday, March 3, 2022 at 11:42:54 AM UTC+1 Konstantin Khomoutov wrote: > On Wed, Mar 02, 2022 at 06:03:46PM +, Skybuck Flying wrote: > > >> Search for "4GB" in this blog post [1] which discusses the GfW 2.35 > release > >> notes. > >> > >> 1. https://github.blog/2022-01-24-highligh

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

> Am I correct in that the work to make mainline Git use size_t where applicable is ongoing? It's currently a little stalled, because it's been hard to partition the problem into small chunks that fit everyone's expectations about what should be in or out for tidying up consequences (e.g. lar

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

On Thu, Mar 03, 2022 at 03:03:34AM -0800, Philip Oakley wrote: >> By the way, do you use a 64-bit install? If, for some reason, you're using >> a 32-bit version, the limit of circa 4 GB (actaually lower) will be >> "native". > > The Git code is merely POSIX compliant (long == size_t; LP64), whil

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

> By the way, do you use a 64-bit install? If, for some reason, you're using a 32-bit version, the limit of circa 4 GB (actaually lower) will be "native". The Git code is merely POSIX compliant (long == size_t; LP64), while Git for Windows uses LLP64 (long=32bits; long long == size_t). Vast sw

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

On Wed, Mar 02, 2022 at 06:03:46PM +, Skybuck Flying wrote: >> Search for "4GB" in this blog post [1] which discusses the GfW 2.35 release >> notes. >> >> 1. https://github.blog/2022-01-24-highlights-from-git-2-35/ > Thanks for the update, however I don't see how this could effect git > chec

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

Hi, My latest hypothesis what might have happened during that normal git checkout on linux kernel is that there was some kind of memory fragmentation and windows could not return enough memory. Test programs could be written to test this hypothesis but I have no time for this. Bye, Skybuck.

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

Skybuck, maybe this will help clear up this issue: https://www.helpndoc.com/documentation/html/Windowsreservedfilenames.html Saga -Original Message- From: skybuck2000 To: Git for human beings Sent: Mon, Feb 28, 2022 12:47 am Subject: [git-users] Re: GIT failed to checkout the linux

[git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

Oh, Oh... So while I was waiting for the linux kernel to checkout I was reading some random stuff about operating systems, or mostly linux boot loaders other os loaders and some people on github involved with linux and then I switch back to the linux checkout and I notice this: new@new-PC MING

[git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

It doesn't hurt to have a little bit of redundancy, especially for something as "important" as the linux kernel lol: (Copy & Pasting this posting/solution to this thread as well) For now the solution I came up with is to: 1. Trust that this github repository is from "official sources": https:/

[git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

Hello, I am back in this thead on 28 february 2022. I read that linux will soon move to a new compiler/c language version, from C89 to C11 so I thought I would try again to checkout the linux kernel so that I can see what it looks like. But surprise surprise, it fails again. This time I recor

[git-users] Re: git bash undo paste

NOW IT SUDDENLY DOES WORK CONTROL-U I HAVE NO IDEA WHY... WHAT AN INCONSISTENT BEHAVING PIECE OF SHIT SOFTWARE. BYE, SKYBUCK. -- 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 f

[git-users] Re: git bash undo paste

THIS SHIT DONT WORK, NOTHING WORSE THAN MANUAL WRONG TOO: https://gist.github.com/tuxfight3r/60051ac67c5f0445efee DOES NOT WORK WHEN IN INSERT MODE HAVE TO BE IN INSERT MODE TO TYPE SHIT. HAS THE WORLD GONE INSANE OH MY GOD.. I HATE THE FUCKERS THAT CREATE THIS BULLSHIT CONTROL _ FOR UNDO A

[git-users] Re: git log --graph --all makes top line fall of screen.

This may solve the white commit hash id problem: https://stackoverflow.com/questions/11515089/why-no-yellow-in-powershell-and-posh-git " It turns out PowerShell's console renders System.ConsoleColor.DarkYellow as white: [Enum]::GetValues([ConsoleColor]) | %{ Write-Host $_ -ForegroundColor $_ }

[git-users] Re: git log --graph --all makes top line fall of screen.

I am getting a small smile on my face ! =D Powershell now looks pretty beautifull and distinsquashed. I did it as follows: changed the font to lucida console point size 12 changed screen background color to black changed screen text to silver the last change makes the commit hashes pop-out in w

[git-users] Re: git log --graph --all makes top line fall of screen.

LOLOLOLOLOLOLOL. POWERSHELL + GIT-POSH SOLVES IT !!! Q stays on the same line ! HAHAHAHAHAHA MICROSOFT+POSH JUST OWNED YOU LINUX BITCHES. BUT NOW ALL IS WELL THE COLORS ARE A LITTLE BIT LESS BEAUTIFULL CYBERPUNKY... MAYBE I CHANGE THAT LATER MAYBE NOT... CONTINUEING. BYE, SKYBUCK. -- Yo

[git-users] Re: git log --graph --all makes top line fall of screen.

For today I am fed up with mintty/git bash which is slow, and buggy as hell, and cmd.exe looks terrible and has no nice colors. Time to try something else: Windows 11 powershell and this: posh-git by dahlbyk Maybe this will be better, time to find out ! =D

[git-users] Re: git log --graph --all makes top line fall of screen.

pascalcoin change " into ' still don't work when rlog or olog types, output: Skybuck@DESKTOP-0T9FP82 MSYS /usr/bin $ alias cd..='cd ..' e:='cd e:' ll='ls -l' ls='ls -F --color=auto --show-control-chars' olog='git --no-pager log --all --graph --decorate --oneline --color=always | tac | sed -e "

[git-users] Re: git log --graph --all makes top line fall of screen.

Unfortunately can't get this shit working, tried a whole bunch of things, another 30 minutes of my life wasted: alias pascalcoin='cd e:\SourceCode\PascalCoinGit\PascalCoin" alias rlog='git --no-pager log --all --graph --decorate --color=always | tac | sed -e "s/[\\]/aa/g" -e "s/[/]/\

[git-users] Re: git log --graph --all makes top line fall of screen.

Oops messed up that important alias, remove one line: was: [alias] rlog = !"git --no-pager log --all --graph --decorate --oneline --color=always | tac | sed -e 's/[\\]/aa/g' -e 's/[/]//g' -e 's/aa///g' | less -r +G -X" should be: [alias] rlog = !"git --no-pager log

[git-users] Re: git log --graph --all makes top line fall of screen.

Reversing the log is a possible solution, it does look a little bit weird, commit hashes at the bottom and commit comments at the top per commit, but could be interesting: git --no-pager log --all --graph --decorate --color=always | tac | sed -e 's/[\]/aa/g' -e 's/[/]/\\/g' -e 's/a

[git-users] Re: git grep --no-index

printf 'bar\nboo\nbzz\n' > foo git grep --no-index --files-with-matches --all-match -e -bar -e boo -e bzz -- foo cd ../ git grep --no-index --files-with-matches --all-match -e -bar -e boo -e bzz -- git/foo git grep --no-index --files-with-matches --all-match -e -bar -e boo -e bzz git

[git-users] Re: GIT FUCKING SUCKS, ONE WORKING COPY IS NOT ENOUGH.

NOW YOU UNDERSTAND WHY: A more advanced git system with working trees per commit. A more advanced git system with working trees per commit. Now this is something to my liking. A git system where each commit and each branch has it's own working tree ?! A tool which automates this would be great

[git-users] Re: GIT FUCKING SUCKS, ONE WORKING COPY IS NOT ENOUGH.

SOME IDIOT ON THE INTERNET MENTIONED TO USE WORKTREE COMMAND I BET THAT OVERWRITES THE DEFAULT AND FUCKS UP PEOPLE REPOSITORY, PRETTY FUCKING STUPID... BUT IT DOES APPEAR GIT HAS SUPPORT FOR MULTIPLE WORKING TREES: Git - git-worktree Documentation (git-scm.com)

[git-users] Re: GIT FUCKING SUCKS, ONE WORKING COPY IS NOT ENOUGH.

ANOTHER NICE EXAMPLE WHY GIT SUCKS. IT'S NOW COPIEING THE ENTIRE HISTORY. NOOO MOTHERFUCKERS I JUST NEED ONE FUCKING VERSION FUCKING IDIOTS LOL. BYE, SKYBUCK. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To u

[git-users] Re: GIT FUCKING SUCKS, ONE WORKING COPY IS NOT ENOUGH.

MIGHT AS WELL COPY THE ENTIRE REPO... IDIOTS ON THE INTERNET TELLING PEOPLE TO USE GIT CLONE FOR THAT HAHAHAH STUPID. DO YOU SEE NOW WHY COPY & PASTE IS SUPERIOR. I BET YOU DONT EVEN HAVE A COMMAND FOR IT IN GIT GIT COPY GIT PASTE FUCK YOU BYE, SKYBUCK. -- You received this message becau

[git-users] Re: GIT FUCKING SUCKS, ONE WORKING COPY IS NOT ENOUGH.

ANOTHER REASON WHY GIT CLONE SUCKS IS IT IMPLIES A SERVER/GITHUB SOMEWHERE FUCK THAT. I SHOULD BE ABLE TO WORK LOCAL ONLY. HOW THE FUCK I CLONE A GIT REPOSITORY FROM LOCAL TO LOCAL NEED MORE COMMANDS HAHAHAHAHAHAH BYE, SKYBUCK. -- You received this message because you are subscribed to th

[git-users] Re: GIT FUCKING SUCKS, ONE WORKING COPY IS NOT ENOUGH.

LISTEN UP YOU MOTHERFUCKERS I JUST CREATED THIS FOLDER ON MY WINDOWS: PascalCoinGit(For Copy&Paste Operations) NOW BECAUSE LINUX/SH/BASH SUCKS SO MUCH I HAVE TO TYPE THIS COMPLETELY IN GIT BASH AND SHIT. WORK ON TAB FEATURE SO IT IS AUTO-COMPLETED OR UPGRADE/UPDATE GIT TO HAVE MULTIPLE WO

[git-users] Re: Git branches vs Mercurial branches

Was: [Mystery solved, I owe you an apology] (was: [git-users] how to remove two commits from a remote server) On Wed, Dec 1, 2021 at 12:18 PM Uwe Brauer wrote: > As I said I am one of the maintainer of > matlab-mode(emacs), a git repository in sourceforge. Since I know > mercurial relatively well

Re: [git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

On Wed, Dec 01, 2021 at 09:32:56PM -0800, skybuck2000 wrote: > It would be nice if GIT would respect the following limits: > > new@new-PC MINGW64 / > $ ulimit -a > core file size (blocks, -c) unlimited > data seg size (kbytes, -d) unlimited > file size (blocks, -

[git-users] Re: GIT failed to checkout the linux kernel on a 6 GB system

It would be nice if GIT would respect the following limits: new@new-PC MINGW64 / $ ulimit -a core file size (blocks, -c) unlimited data seg size (kbytes, -d) unlimited file size (blocks, -f) unlimited open files (-n) 256 pipe size(

[git-users] Re: GIT: Split file into multiple files, then detect changes in updated original file and apply to multiple files.

Split all at once so far not succeeded, individual branches offer some help, by allowing git -mv to indicate to git that a big file was renamed/reduced to a small file. Then later all individual branches can be merged to produce a build. The problem with this is if changed are done to the new

[git-users] Re: git --amend doesn't seem to work as I anticipated

I amended the commit and then re-merged and the amended commit did not merge On Thursday, 2 September 2021 at 19:02:01 UTC+10 philip...@iee.email wrote: > > Do amends not merge? > > In general, don't try to `--amend` a merge. It would produce an evil merge > (i.e. something in a notionally clea

[git-users] Re: git --amend doesn't seem to work as I anticipated

> Do amends not merge? In general, don't try to `--amend` a merge. It would produce an evil merge (i.e. something in a notionally clean merge that wasn't actually present in either branch). As best I remember, if you try to amend a merge you only get an updated single parent commit, rather tha

[git-users] Re: Git locking directories (not closing handles)

On Tuesday, July 6, 2021 at 12:15:16 AM UTC+3 vind...@gmail.com wrote: Git prevents me from modifying the repository folder unless I reboot the PC. It started happening to me after fresh-installing Windows 10 today. During the setup, I enabled some experimental feature called "file watcher". Is

[git-users] Re: Git locking directories (not closing handles)

what sort of " modifying the repository folder " were you attempting to do? Also which version are you running? There has been an update in the last few days which included changes to the file watcher (fsmonitor). If the update solves you problem, simply report that. If not, add a few more deta

[git-users] Re: Git signs with gpg-key whose email matching author email instead of gpg-key that matches user.signingkey?

Example of bug: ``` [2021-06-28 11:45:09] 0 x10an14@x10-laptop:~/.password-store -> $ gpg -k 40342E76F04C8890B58CB9FA321FC44B567B28FA pub ed25519 2021-06-22 [C] 40342E76F04C8890B58CB9FA321FC44B567B28FA uid [ultimate] x10an14 sub ed25519 2021-06-22 [S] [expires: 2023-01-01] sub

[git-users] Re: git merge problems

Hi Thomas, I have had similar problems with some public repositories and in each case, it has been due to the repository owner abandoning/discontinuing the "master" branch and using "main" instead. I too have been forced to reclone and, after doing so, have seen "main" as the default branch.

[git-users] Re: git amend wont merge

Roughly speaking, this is a "feature". Could you do a diagram of the merge - amend - merge process. Its not obvious which parts merged which at the second pass. In the first merge you had the code growing so it accepted the left over code as part of the mainline. Then when you tried the secon

[git-users] Re: git config autocrlf true

When working in a multi-OS team, there needs to be a common standard for the text file line endings. Given that Git was designed as the version control system for Linux, the Unix LF line ending was chosen as the default setting for storage _within_ the repository. This means that users on Win

Re: [git-users] Re: Git - how to determine what files changes

> Lionel B. Dyck < > Website: https://www.lbdsoftware.com > > "Worry more about your character than your reputation.  Character is > what you are, reputation merely what others think you are." - John Wooden > >   > > From: git-users@googlegroups.com On >

RE: [git-users] Re: Git - how to determine what files changes

20, 2020 5:01 PM To: Git for human beings Subject: [git-users] Re: Git - how to determine what files changes Do you mean that you simply need to get the direct difference between A and B. Or do you mean you want to see hwat changed in A since B was forked, and like wise what changed in B si

RE: [git-users] Re: Git - how to determine what files changes

ore about your character than your reputation. Character is what you are, reputation merely what others think you are." - John Wooden From: git-users@googlegroups.com On Behalf Of Philip Oakley Sent: Saturday, June 20, 2020 5:01 PM To: Git for human beings Subject: [git-users] Re: Git

[git-users] Re: Git - how to determine what files changes

Do you mean that you simply need to get the direct difference between A and B. Or do you mean you want to see hwat changed in A since B was forked, and like wise what changed in B since that same fork point? Have a look for the three dot `...` notation to get a fork point and also the boundary

[git-users] Re: Git with Samba: "Unlink of file"

I comment on my post hoping that it will help someone who has the same problem. I reinstalled the machine with Samba and Linux: - with Ubuntu Server 20.0 -> still problem - with Ubuntu Desktop 20.0 -> still problem - with Centos 8 -> Solved Il giorno giovedì 18 giugno 2020 18:44:10 UTC+2, Robe

[git-users] Re: git reports conflicts for files not mutually changed

Hi Philip! Thanks for the response. You are talking about different files: the file with (2+-) changes is "OutOfTimerCrossValidator.java" and the file in conflict is "OutOfTimeCrossValidator*Runner*.java". I found this on the documentation (https://git-scm.com/docs/merge-strategies), perhaps

[git-users] Re: git reports conflicts for files not mutually changed

In the Merge Left marker it shows a very small change (2+-) for that file, at least I think that's the file. Did you expect that? What was the change? Was it a white space or end of line (eol) change)? You may have a 3-way merge (mergebase, left and right commits) detecting the white space an

Re: [git-users] Re: Git completely thrown a curveball now...

Hi Shannon, >I think I know what happened now after analysis. That's good news. A chance to mark it all up as a 'learning experience' after the initial frustrations. I hadn't realised that you could get into that issue on GitLab. Maybe as the repo owner, the "request" was automatically accepted,

[git-users] Re: Git completely thrown a curveball now...

I think I know what happened now after analysis. I followed the message I received when I pushed the branch to origin: remote: remote: To create a merge request for payment-gateway, visit: remote: https://gitlab.com/SJW/absee/-/merge_requests/new?merge_request%5Bsource_branch%5D=aftersales re

[git-users] Re: Git completely thrown a curveball now...

Which way did you merge? did you merge the what was in master into aftersales, or the other way around? Have you used a repository viewer like gitk which will show where the two branches are pointing to and the changes that each commit / merge has? Can you show a small extract of you difficult

[git-users] Re: git-recent: Quickly check out your favorite branches

my aliases are: alias.bsort for-each-ref --sort=committerdate --format='%(refname:short) %(committerdate:short) %(authorname)' refs/heads alias.bsort2 for-each-ref --sort=authordate --format='%(refname:short) %(committerdate:short) %(authorname)' refs/heads alias.bsort-rem for-each-ref --sort=au

[git-users] Re: Git keeps getting out of sync and I cant figure it out

You mention that you think you are "overwriting changes". While that is what it looks like on the surface, it isn't actually true below the surface in the repository. The repository is a Write Once Read Many (WORM) type storage, so all your previous writings are still there, waiting to be re-u

[git-users] Re: git-bash (Windows) displays the wrong version.

Thank you Philip, your guidence helped me to find the correct path. I couldn't find with cmd.exe, that I had 3 versions of Git on my machine. But I could find them using git-bash. One of them is found inside Anaconda, the other one came with C++ and Codelite installaiton and the one that I've

[git-users] Re: git-bash (Windows) displays the wrong version.

Thank you Philip, your guidence helped me to find the correct path. I couldn't find with cmd.exe, that I had 3 versions of Git on my machine. But I could find them using git-bash. One of them is found inside Anaconda, the other one came with C++ and Codelite installaiton and the one that I've

[git-users] Re: git-bash (Windows) displays the wrong version.

Thank you Philip, your guidence helped me to find the correct path. I couldn't find with cmd.exe, that I had 3 versions of Git on my machine. But I could find them using git-bash. One of them is found inside Anaconda, the other one came with C++ and Codelite installaiton and the one that I've

[git-users] Re: Git keeps getting out of sync and I cant figure it out

Ok, I just went ahead and did a pull... It shows me the changes... I realised that on Friday I modified the README.md... It's way too hard to keep up... I think git is too complicated for me... thanks anyway On Monday, 27 April 2020 12:48:22 UTC+10, SJW wrote: > > I keep trying to learn and use gi

[git-users] Re: git-bash (Windows) displays the wrong version.

Hi Ahmet, I presume you know that you can have multiple copies of git, at different versions, on the same machine. And they 'look' the same, because each has a different fake root directory. IN each of the two tests, `cd / # to get to the root dir pwd -W # to get the windows path of the curren

[git-users] Re: git log (HEAD->master, origin/master) vs (HEAD -> master)

Hi, I believe this is a natural effect of being a distributed system. The two different PC's have different setup, so when git is displaying the local repository it can only 'attempt' to infer what the contents of the remote repositories (content of other reference servers) is, such as 'origin'

[git-users] Re: Git over Perforce

I don't want to work between the two systems, I want to work strictly with git; but since I'm restricted to a p4 configuration file, work around this using only git ? Rather then the system, sending or commiting to perforce, it does all this though git. I searched the list, but from my search

[git-users] Re: Git over Perforce

Don't know much about Perforce (p4) but there is an interface between the two systems. Search the git list archive for "p4" or "perforce" to get a start https://lore.kernel.org/git/?q=p4 Philip On Sunday, February 23, 2020 at 5:16:12 PM UTC, CrestChristopher wrote: > > How can I create a Perfo

[git-users] Re: Git Newbie

thanks a lot ! really very helpful среда, 15 января 2020 г., 9:19:15 UTC-8 пользователь Subbu Subbu написал: > > How do you select the build software after doing a fork of your source in > github. How can multiple developers use github. > > Regds > Subbu > -- You received this message becaus

Re: [git-users] Re: git commit message template plugin

Ok, I have obviously misunderstood. What I was meaning was our system where that hook throws up a customised commit message with different sections to be filled in by the user, and I thought that was what you were after. Apologies for my misunderstanding. On Fri, 20 Dec 2019, 20:21 Python Prog, w

[git-users] Re: git commit message template plugin

Still doesn't answer my question,I am looking for a UI to pop-up (via plugin) on git commit so that user can the requested commit message fields On Wednesday, December 18, 2019 at 3:42:46 PM UTC-8, Python Prog wrote: > > Hello > > I am looking to develop a commit message plugin where developers

Re: [git-users] Re: Git ignores global filemode setting when clonning new repositories

Hi Jiří, The thing to note here is that filemode is only affecting (the understanding of) the executable bit. It does *not* affect the file contents at all, so if the 'empty' .gitkeep file is now being shown as having gained a line then there is some other effect going on. It maybe that th

Re: [git-users] Re: Git ignores global filemode setting when clonning new repositories

Thanks for reply, Repos are hosted on gitlab and most devs are on linux (but not all) and as example, when i set filemode=true in one of the repos, it gives me changes in .gitkeep file saying i added a line to it (its empty file) But again, since it does set it automatically, guess my option will

[git-users] Re: Git ignores global filemode setting when clonning new repositories

Hi, the clone command *automatically *detects if your local file system is 'filemode' compatible. `git help config` search for `core.filemode` " git-clone(1) or git-init(1) probe the filesystem to see if it handles the executable bit correctly and this variable is automatically set as necess

[git-users] Re: git pull failed.

So, you need to be on a branch. That is because 'pull' is a fetch, then a merge into the current branch. You could read about 'remote tracking branches' and use just 'fetch', Or you could start by checking out (or creating) your new current (e.g. master) branch. You did not say how you got to

[git-users] Re: Git pull/checkout streaming API/CLI

Hi again :) Thanks for all the feedback, really appreciate it! If when you say “run git locally” you mean perform the actual checkout by running the usual commands, that is what I’m currently doing just to unlock myself, but being this part of an API server and being the purpose to store the wh

[git-users] Re: Git pull/checkout streaming API/CLI

Hi F, Yes, the https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols are the ones that could be considered as an API. Though it maybe worth simply running Git locally so that you don't need to write any code..just a few scripts. Other options are looking at Git Bundle, which is norm

[git-users] Re: Git pull/checkout streaming API/CLI

Hi Phillip, thanks for the pointers. I did not know about fast-import/export, I’ll have a look as streaming is what I need :) As far as pack streams, is this what you refer to https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols ? I’ve read it this morning, not sure yet if it’ll do b

[git-users] Re: Git pull/checkout streaming API/CLI

On Sunday, September 8, 2019 at 9:55:23 AM UTC+1, fru xo wrote: > > Hi all, > I’d love to be able to issue a git pull/checkout and stream its results to > an on-line cloud storage for another party there to actually downloading it > and working with the source. > Roughly just pipe all from a Git

Re: [git-users] Re: git log --graph with a sort of local revision number

>>> "PO" == Philip Oakley writes: > What would be the benefit of you having your local reverse count of > commits? I.E Which git commands would actually use that information. Convenience. From time to time I want to checkout a commit which is close to HEAD (say HEAD -3) So git checko

[git-users] Re: git log --graph with a sort of local revision number

What would be the benefit of you having your local reverse count of commits? I.E Which git commands would actually use that information. Or perhaps maybe at the moment it's more of a comfort blanket desire because of the idiosyncratic nature of some of the git commands (it can be a battle...)

[git-users] Re: git svn clone author missing in authors file

Sorry for the quite misleading post. When i tried to clone with -rREVNO:HEAD leaving out the inital www-data revision, i got errors for other users as well. Turned out to be a malformatted authors file... Am Montag, 24. Juni 2019 13:47:26 UTC+2 schrieb HTW: > > Hi, > > im trying to migrate from

Re: Messaggio privato relativo a: [git-users] Re: git rebase obscure and vague options

Hi On 19/04/2019 16:51, neverasimov wrote: Hi Philip, your no problem is for ... your incoming concrete example for --merge rebase command line usage? Thank you in advance, I wait patiently ... :-) the phrase "No Problem" was a (British) short answer to your comment that you had not managed

  1   2   3   4   5   6   7   8   9   10   >