[git-users] Re: What is the structure of Git tree, commit, and tag objects that get hashed to produce an object ID?

2023-11-14 Thread Philip Oakley
Hi, A good place to look at the structure of the Git objects is https://git-scm.com/book/en/v2/Git-Internals-Git-Objects The codebase itself can get rather deep. A good place to look at changes is the mailing list https://lore.kernel.org/git/ and search for the various terms you are intereste

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

2023-09-28 Thread Philip Oakley
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

2023-07-24 Thread Philip Oakley
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

[git-users] Re: clean/smudge filter with age

2023-06-09 Thread Philip Oakley
And, make sure that your settings are committed first. I think your .gitattributes file should be committed first, so that the git add of the secrets is actioned. On Friday, June 9, 2023 at 9:52:44 PM UTC+1 Philip Oakley wrote: > Not sure if I understood what you are saying. My impression

[git-users] Re: clean/smudge filter with age

2023-06-09 Thread Philip Oakley
Not sure if I understood what you are saying. My impression is that you have an existing repo, cloned from a server (with clone on a server;-), and you now want to have the in-repository file blobs be stored in an encrypted manner. It sounds as if you have two problems. 1. your starting point i

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

2023-05-05 Thread Philip Oakley
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: Test message - HTML?

2023-04-28 Thread Philip Oakley
The "Git Users" (alt "Git for human beings") is a googlegroups hosted discussion list and appears to always use HTML. Folks can choose how they receive notification emails, even though they are typically prepared in HTML editor. I think I have mine set to sending plain text and attachments. If

[git-users] Re: Slight UX regression in `git range-diff`?

2023-03-23 Thread Philip Oakley
> What do you think? Should I bring this up on the Git mailing list? Or have I missed something/misunderstood something? It does sound worth including in a mailing list discussion, even it it's only adding a short clarifying sentence in the man page or its syntax summary (synopsis) Draft patc

[git-users] Re: how is name-rev determined

2023-03-06 Thread Philip Oakley
Hi Uwe, (supplemental to Felipe's reply) Underlying the 'branch name' "problem" is the same conceptual shift that Git adopts for the separation of file names from the (blob) content. By separating the metadata from the item, Git allows itself to pivot from being human centric (with all our inse

[git-users] Re: DCSV in 2007: Linus Thorvalds talk

2023-02-24 Thread Philip Oakley
As I understand it, each of the Linux area maintainers made/provided their own [public readable] server so that they could fetch (and merge, = pull) from each other (see `git request-pull`) and could also push to some reference servers, or each other. Being Linux hackers (in the best sense of

Re: [git-users] Fast method to get a range diff that excludes merges

2023-02-22 Thread Philip Oakley
examples ;-) On Wednesday, February 22, 2023 at 12:23:50 PM UTC Philip Oakley wrote: > I haven't tried to follow that example properly yet.. > > However one other thing to look at is the "History Simplification" that > includes parent re-writing that's in the rev

Re: [git-users] Fast method to get a range diff that excludes merges

2023-02-22 Thread Philip Oakley
I haven't tried to follow that example properly yet.. However one other thing to look at is the "History Simplification" that includes parent re-writing that's in the rev-list-options.txt file and then included in a number of man pages (log, show, short-log,..). There are some slippery concep

Re: [git-users] Fast method to get a range diff that excludes merges

2023-02-21 Thread Philip Oakley
This may also be an issue of the History Simplification process and / or the 'flattening' processes for history linearisation and rebases. The flattening is a known phenomena and was currently being mentioned on the Git List, so I have noted this there. [1] https://lore.kernel.org/git/a856dd16

[git-users] Re: Fast method to get a range diff that excludes merges

2023-02-21 Thread Philip Oakley
> diff between those commits *excluding* merge commit changes, What does this mean? If we have commit sequence ``` A-B-C-M-D-E-F / S-T-U ``` and want you complete diff between A..F, but somehow excluding merge M (and hence S-T-U), what does that mean. Was the merge clean, or were the

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-09 Thread Philip Oakley
Uwe, Do the individual students have any form of personal 'HOME' storage for saving their local project work? How is that organised? I guess emails are all done via a web browser and 'cloud' storage, so that would provide no guidance. Likewise much of their student rotas would be accessed via

[git-users] Re: fast-import: cannot use previous commit hash in "from"

2023-01-03 Thread Philip Oakley
A quick comment. While I don't use fast-export, fast-import, I have seen comments on the git list https://lore.kernel.org/git/ that suggest some times the code is either running separate threads in parallel, or is don't some computations out of sequence, that can mean that some hashes aren't av

Re: [git-users] off topic, git host without ssh for pushing

2022-12-11 Thread Philip Oakley
A better formatted link https://git-scm.com/docs/SubmittingPatches On 11/12/2022 11:40, Philip Oakley wrote: > It's worth having a look at Git's > 'SubmittingPatches' [2] doc for some of the "Cheats" that the Git team > use to look good ;-) >

Re: [git-users] off topic, git host without ssh for pushing

2022-12-11 Thread Philip Oakley
On 10/12/2022 22:00, Uwe Brauer wrote: >> The great thing was I >> could save (to Git) snippets (hunks) of my code out of sequence and have >> instant replay of those bits of quick trial code that would recreate >> figures and tables that became useful in retrospect. Sort of a 'commit a >> minute'

Re: [git-users] off topic, git host without ssh for pushing

2022-12-09 Thread Philip Oakley
On 09/12/2022 18:50, Uwe Brauer wrote: >> The `.git` folder for the users local repo is stored with the project >> directory anyway, so the restrictions on project access should be the same. > Well that will be another problem. > > The chances that the students will use the command line is close t

Re: [git-users] off topic, git host without ssh for pushing

2022-12-09 Thread Philip Oakley
Hi Uwe, On 09/12/2022 15:53, Uwe Brauer wrote: > Next semester I want to run an > experiment and encourage my students to use a VC for their coding, and > since Matlab supports git (and svn) it will be git. > > However I encounter a problem: so far I have tested github and bitbucket > and both don

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Philip Oakley
(for the discussion) On 04/12/2022 12:00, Konstantin Khomoutov wrote: > Git never supported keeping its repositores on non-local filesystems such as > OneDrive (or whatever other "cloud" drive or networked filesystems such as NFS > or CIFS/Samba). It does have some hacks and kludges to facilitate

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-04 Thread Philip Oakley
On 04/12/2022 13:34, rozanski.s...@gmail.com wrote: > Of course, snapshotting done by cloud synching software is absolutely broken > when it comes to version control systems such as Git because such pieces of > synching software are blissfully unaware about the "snapshot semantics" such > VC sys

[git-users] Re: mentorship for Gsoc & Open Source Contribution

2022-12-03 Thread Philip Oakley
Hi Vishal, The GSOC is managed through the Git developers List (at g...@vger.kernel.org) . The developer page at https://git.github.io/ has links for mentoring, the SoC, hacking on git, and other news (etc.). To join the Git List see http://vger.kernel.org/vger-lists.html#git *REMEMBER: Sub

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-02 Thread Philip Oakley
tone. On Friday, December 2, 2022 at 2:46:43 PM UTC Konstantin Khomoutov wrote: > On Fri, Dec 02, 2022 at 05:36:28AM -0800, Philip Oakley wrote: > > >> do they print sensible information? > [...] > > Also, if you look in the project top level directory, does it contain >

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-02 Thread Philip Oakley
> do they print sensible information? @rozans: Extra clarification: could you also copy and paste the exact output into any responses, as often there are extra clues in having the exact words and character stings from the error reports (and successes!). Also, if you look in the project top l

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-16 Thread Philip Oakley
Hi all, On 16/11/2022 11:55, Konstantin Khomoutov wrote: >> I thought the main difference between git and hg, is (besides the >> command syntax) the way branches are considered, a git branch is similar >> to a bookmark, while a named branch has no equivalent in git. > This is true, but the termino

[git-users] Re: Would like to generate logs just like in the official documentation from a real git repo

2022-10-18 Thread Philip Oakley
I'd been looking at the `log` man page, rather than the rebase man page! A the moment it's not possible. It might become possible if (big if): 1. there was a way of labelling all commits with single letter labels, and limiting the size to

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

2022-10-18 Thread Philip Oakley
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: Would like to generate logs just like in the official documentation from a real git repo

2022-10-14 Thread Philip Oakley
Hi Amine, Would you be able to provide a link to any particular example that you felt may have been formatted via `git log` or similar. Likely places are via the //git-scm.com/doc site, and/or (even better) via /git.git/Documentation/

Re: [git-users] Re: "\ No newline at end of file" displayed for symlinks

2022-10-13 Thread Philip Oakley
There is a further discussion on the Git mailing list on this subject [1]. The key point is that this is not a "warning" (in the 'treat warnings as errors' vein [2]), rather is a statement about the presence or absence of a particular 'white space' in the file. Unix tend to believe that a comple

[git-users] Re: "\ No newline at end of file" displayed for symlinks

2022-10-12 Thread Philip Oakley
https://stackoverflow.com/a/954575/717355 may be a suitable answer that matches what you are seeing. On Wednesday, October 12, 2022 at 9:06:01 PM UTC+1 ignacio...@eclypsium.com wrote: > Hello, > > Sorry I forgot to mention I'm running a Linux system. > > Let me give you an example about how to

[git-users] Re: "\ No newline at end of file" displayed for symlinks

2022-10-12 Thread Philip Oakley
Is this a Linux/*nix system, or a Windows (Git for Windows [GfW]) system? It's important because Symlinks on nix systems are, as best I understand it, a file system property, while on Windows it's emulated as a file (IIRC) and the Git Index makes a note of that mode status. Can you show the ac

[git-users] Re: There is no tracking information for the current branch.

2022-08-19 Thread Philip Oakley
There are few things going on within Git that can catch folks unawares. The first is that you should compare the idea of whether you want to create a duplicate copy, or whether you are looking to create a twin, with a separate life of it's own. The latter (for which clone is 'designed') is the

Re: [git-users] Feature Request - Branch Metadata or Descriptions

2022-07-21 Thread Philip Oakley
On 21/07/2022 12:13, Konstantin Khomoutov wrote: > On Mon, Jul 18, 2022 at 02:34:44PM -0700, Dan Rosen wrote: > >> Adding metadata to branches would be helpful for third party APIs to >> organize and tag branches without putting them in the branch name. For >> example, project management software

Re: [git-users] Re: Feature Request - Branch Metadata or Descriptions

2022-07-19 Thread Philip Oakley
On 19/07/2022 00:10, Dan Rosen wrote: > Is there no board of directors to discuss improvements to Git? Git is Open Source, so anyone can propose patches that may improve Git's capability (mailing list https://lore.kernel.org/git/). There is a maintainer who makes a final judgement, after reviews

[git-users] Re: Feature Request - Branch Metadata or Descriptions

2022-07-18 Thread Philip Oakley
I believe this has been discussed a few times. However branches are meant to be local and ephemeral, which goes against that 'organise' view that, in a sense, sees branches as tasks to be controlled. Git, being distributed, looks to the code content, along with the DAG, to get it's perspective

Re: [git-users] Feature idea: Warning for git reset --hard with unstaged local changes

2022-07-18 Thread Philip Oakley
> Still, implementing such mode is impossible in `git reset --hard` because it's being extensively used in scripts which must continue working unmodified. I'm more upbeat about the possibilities here for a multi-graded option for capturing the user's prior tree, with it's user modified version

[git-users] Re: Feature request | GIT keep recently used files separately for each branch

2022-07-01 Thread Philip Oakley
Git already keeps the last modified date (mtime) in the index and I thought it could be accessed through appropriate commands (git ls-files), though a check of the man pages failed me), also the --format option is slowly being added to more commands. Is the file mtime what is needed? I don't th

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

2022-07-01 Thread Philip Oakley
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] Visualize all fork (branched) point from the main/master branch

2022-06-29 Thread Philip Oakley
> git branch [-r|-a] --contains 4356hae I should have known/remembered that! Thank you for the clarification. On Wednesday, June 29, 2022 at 11:27:35 AM UTC+1 Konstantin Khomoutov wrote: > On Tue, Jun 28, 2022 at 01:54:06PM -0700, Namasi wrote: > > [...] > > > For instance if "main" branch has

Re: [git-users] Visualize all fork (branched) point from the main/master branch

2022-06-28 Thread Philip Oakley
Correction - it'll be the `contains` variant. (assumes dropping the negation works as expected..) On Tuesday, June 28, 2022 at 10:37:19 PM UTC+1 Philip Oakley wrote: > Try the `for-each-ref` command. I use it to list my most recent branches, > sorted so that the newest is at the

Re: [git-users] Visualize all fork (branched) point from the main/master branch

2022-06-28 Thread Philip Oakley
Try the `for-each-ref` command. I use it to list my most recent branches, sorted so that the newest is at the end of the displayed list. my "branch sort" alias looks like: ``` bsort = for-each-ref --sort=committerdate --format='%(refname:short) %(committerdate:short) %(authorname)' refs/heads ``

[git-users] Re: About config

2022-06-06 Thread Philip Oakley
The `sudo make install` is a known problem from the effects of the `safe.directory` design, which was in response to a CVE vulnerability of accessing repositories that you don't own. The use of `sudo` changes the userID, so one can fall into the trap of not appearing to own repositories you kn

[git-users] Re: How to resolve merge conflicts on octopus merges

2022-05-17 Thread Philip Oakley
treeMMN MMfinal: B,XYz:treeMMN MMside: B,MMN;treeMMN (2-parent merge) Philip On Monday, May 16, 2022 at 1:20:36 PM UTC+1 Philip Oakley wrote: > One of the big unstated aspects is the distinction between --automatic and > --interactive expectations. The main Git project has the a

[git-users] Re: How to resolve merge conflicts on octopus merges

2022-05-16 Thread Philip Oakley
One of the big unstated aspects is the distinction between --automatic and --interactive expectations. The main Git project has the assumption of --automatic merges without any need for user intervention. That's on the assumption of a 'clean' workflow with proper separation of concerns, small c

[git-users] Re: How to resolve merge conflicts on octopus merges

2022-05-13 Thread Philip Oakley
There's a recent discussion thread about octopus merges on the main Git List that may be of interest https://lore.kernel.org/git/caoltt8s8rh+vycuaqbentmphirqw7hroplfpkxfntjq6bng...@mail.gmail.com/t/#u On Friday, May 13, 2022 at 12:09:35 PM UTC+1 johannes.lipp...@gmail.com wrote: > (Of course

Re: [git-users] graphical interface for git (in Windows OS)

2022-05-11 Thread Philip Oakley
On 11/05/2022 14:20, Ballin Guillaume wrote: Why not using git gui/gitk ? Thay are the official graphical interface for git and they works perfectly on linux, macos and windows. I support the git-gui and gitk pair of UI's. I find that `gitk` (or any of the equivalent commit graph viewers) to b

[git-users] Re: How to know the push time

2022-04-26 Thread Philip Oakley
On Tuesday, April 26, 2022 at 3:37:29 AM UTC+1 guangy...@gmail.com wrote: > I'm a programmer from China, and I have a question when I use git, that I > can't get the push time of the code. git seems to only log commit times. Internally (locally), git does log all the changes to references (the

[git-users] Re: GSoC 2022

2022-04-22 Thread Philip Oakley
These applications should be sent to the g...@vger.kernel.org address. They MUST be plain text. Any HTML is treated as spam and deleted... The list archive is at https://lore.kernel.org/git/?q=GSOC (pre-queried for GSOC ;-) Philip On Tuesday, April 19, 2022 at 12:17:52 PM UTC+1 debra...@gmail

Re: [git-users] Re: Restoring old version of directory tree with code

2022-04-03 Thread Philip Oakley
PM, H wrote: > > On 08/23/2021 06:47 PM, H wrote: > >> On August 23, 2021 1:47:19 PM EDT, H wrote: > >>> On 08/22/2021 07:04 PM, H wrote: > >>>> On 08/22/2021 04:23 PM, H wrote: > >>>>> On 08/19/2021 06:08 AM, Philip Oakley wrote: > >

[git-users] Re: Bug report

2022-03-23 Thread Philip Oakley
. On Wednesday, March 23, 2022 at 1:35:57 PM UTC Philip Oakley wrote: > The key element of the bug report email is that it must be in plain text > only! Gmail is notoriously bad for trying to add HTML parts to the email > which means that the report will be dumped as spam. > &g

[git-users] Re: Bug report

2022-03-23 Thread Philip Oakley
The key element of the bug report email is that it must be in plain text only! Gmail is notoriously bad for trying to add HTML parts to the email which means that the report will be dumped as spam. There are various instruction on sending plain text emails on Gmail. "how to send plain text ema

[git-users] Re: Two machines, one repo, push errors on second machine when trying to push

2022-03-17 Thread Philip Oakley
Ahh, I think you have a `Files` view mental model, rather than a `project` view mental model. Git uses the `whole project` mental model, with any separation of changes being on different branches. It sounds like you haven't created a separate branch for each of the separate pieces of developme

[git-users] Re: Exclude the master branch sources from a submodule commit ID.

2022-03-15 Thread Philip Oakley
There are two, maybe three, points here. Firstly determine which type of submodules you are using - in particular is the submodule's object store part of the main repository, or is it separately held in the submodule - it's an implementation detail but moderately relevant here. I.e. you need t

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

2022-03-04 Thread Philip Oakley
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

2022-03-03 Thread Philip Oakley
rote: > 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"

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

2022-03-03 Thread Philip Oakley
> 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: How to implement WebRTC as a Git Protocol?

2022-02-21 Thread Philip Oakley
Hi Git Noob, Supplemental to Konstantin's info, there is further details of the various protocols in the https://github.com/git/git/tree/master/Documentation/technical directory to complement the man pages. Hope that helps On Monday, February 21, 2022 at 10:46:45 AM UTC Konstantin Khomoutov w

[git-users] Re: What is a git-index/staging area ?

2022-02-14 Thread Philip Oakley
Git loves to mix the "concept" with the "implementation", with overlaps all the way down (e.g. refs and branch names are just a "string of characters", but for convenience it started as a file path with the `/` slash delimiters .. So. The DirCache/Cache/Index/Staging area are all very similar w

[git-users] Re: Summer of Code

2022-02-05 Thread Philip Oakley
Hi Samarth, For Git, have a look at the details in the https://git.github.io/ pages (tabs on left hand side bar) on SoC projects and micro projects. The Git mailing list is at https://lore.kernel.org/git/ (along with other places). Try search for GSOC and limiting to the last 6 months for the

Re: [git-users] [RFC on an idea] Commit Bundles

2022-01-27 Thread Philip Oakley
> I understand most of what you said except: > > But use the rebase/editing on the feature development branch to make that look clean (not to hide your mistakes, but to make it easier to understand and bug fix later), Second guessing the parts that need explaining Part of the original ide

Re: [git-users] [RFC on an idea] Commit Bundles

2022-01-27 Thread Philip Oakley
Use --first-parent log/show when looking at your history to get that clean "+1 feature" view. But use the rebase/editing on the feature development branch to make that look clean (not to hide your mistakes, but to make it easier to understand and bug fix later), and then merge with --no-ff set,

Re: [git-users] Re: Try to reproduce a sample repository according History Simplification section of git log

2022-01-18 Thread Philip Oakley
Thanks for the test repo. some notes. When I looked at it using `gitk` (with options), it generally got things right, but it looks like the gui's don't always do the simplifications. What I did notice was the tendency to need the --graph option to see the history simplification. I do admit th

Re: [git-users] Re: Try to reproduce a sample repository according History Simplification section of git log

2022-01-15 Thread Philip Oakley
I think " The commit c was made with empty change, git commit --allow-empty!" isn't a correct reading of the docs. https://github.com/ChuckTest/git-history-test/blob/de6543aca0c16e4740a8834f4df23894bea5d776/foo As noted earlier, my reading of the text is that file foo should have changed to co

[git-users] Re: Doubts regarding git codebase

2022-01-14 Thread Philip Oakley
M UTC Philip Oakley wrote: > The codebase is C89, with just a few C99 items. Make sure that your linter > is able to play well with old style 'dumb' (cautiously basic) coding styles. > > Its worth reading the https://github.com/git/git/blob/master/README.md > for the link

Re: [git-users] Re: Try to reproduce a sample repository according History Simplification section of git log

2022-01-14 Thread Philip Oakley
The text itself is at https://github.com/git/git/blob/master/Documentation/rev-list-options.txt#L386-L425, should you wish to try making it clearer. Unfortunately, there isn't a sample repo that contains the various examples that are in the documentation. There are one or two that are hidden i

[git-users] Re: Doubts regarding git codebase

2022-01-13 Thread Philip Oakley
The codebase is C89, with just a few C99 items. Make sure that your linter is able to play well with old style 'dumb' (cautiously basic) coding styles. Its worth reading the https://github.com/git/git/blob/master/README.md for the links to the https://github.com/git/git/blob/master/Documentatio

[git-users] Re: Try to reproduce a sample repository according History Simplification section of git log

2022-01-13 Thread Philip Oakley
Commit C is to be compared to I. In `I` foo contains "asdf" In `C` foo contains "foo" as described under 'A' (same as B, same as C...) so a confusion about the english way of describing and the graphical expectation. At least that's what I'm thinking. On Thursday, January 13, 2022 at 11:59:

Re: [git-users] Need help....locked out

2022-01-02 Thread Philip Oakley
t be able to help > > On Sun, Jan 2, 2022, 11:19 AM Philip Oakley wrote: > >> I thought that the basic Github login (password and 2FA codes) was >> separate from the ssh key stuff. >> >> There is a support page link >> <https://docs.github.com/en/authenticat

Re: [git-users] Need help....locked out

2022-01-02 Thread Philip Oakley
I thought that the basic Github login (password and 2FA codes) was separate from the ssh key stuff. There is a support page link on managing ssh keys suggesting that you could delete all ol

[git-users] Re: How to print out a git repo (local)

2021-12-22 Thread Philip Oakley
An interesting question, but maybe not quite as clear as to what is desired. - Are you just looking for a print out of the files in the final commit - the finished project? - Are you looking for a listing of all the commits (headline/subject) from the very beginning to the final c

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

2021-12-05 Thread Philip Oakley
Set up different 'username' on the two machines (or committer / author difference, etc). Why does it matter? On Sunday, December 5, 2021 at 3:53:08 AM UTC skybu...@hotmail.com wrote: > Hello, > > Right now I am working with git on two different machines: > Windows 7 on real hardware. > Windows

Re: [git-users] GITK: Useability issue, can't scroll through fie list ?

2021-12-02 Thread Philip Oakley
> 1. git gui does not have a link to gitk ? Use the top left menu: Repository >> Visualise .. for the two gitk viewer options. > _3_. clicking on right bottom view where it says "path"[sic] "tree" does not make gitk context aware. The gitk Patch[!] / Tree options will swap what is being disp

Re: [git-users] Re: Command to display current branch tracking information ?

2021-12-02 Thread Philip Oakley
UTC Philip Oakley wrote: > > Sorry but what is {u} supposed to be? The url of the remote server? > > The '@{u}' is a shorthand for '@{upstream}' typed exactly, that modifies > the given branch name to become the upstream of the given branch, and then > rev-pa

Re: [git-users] Re: Command to display current branch tracking information ?

2021-12-02 Thread Philip Oakley
ms off the leading part of the "ref/./.". Worth looking up "@" and its qualifiers ;-) On Thursday, December 2, 2021 at 7:45:33 AM UTC o...@ucm.es wrote: > >>> "PO" == Philip Oakley writes: > > > git rev-parse --abbrev-ref --symbolic-full-n

[git-users] Re: Command to display current branch tracking information ?

2021-12-01 Thread Philip Oakley
git rev-parse --abbrev-ref --symbolic-full-name @{u} Had to look it up yesterday. Then you need git remote -v # or -vv to find out where that remote really is! - I have 10 remotes for variations of 'git' itself, including "my" which is my publish remote. On Wednesday, December 1, 2021 at 2:

[git-users] Re: Rebase documentation is not clear enough.

2021-11-30 Thread Philip Oakley
'Documentation' is a tricky subject. Are the manuals for reference (i.e. looking up the specifics that you already understand) or for education, or training, or for examples, or concepts, philosophy and mental models, etc. At the moment they (man pages) are primarily for reference, rather than

[git-users] Re: GSOC

2021-11-25 Thread Philip Oakley
Hi, The Git GSOC is coordinated through the main Git Developers List (plain text email). The 'primary' searchable archive is at https://lore.kernel.org/git/ Git, like Linux is coded, in the main, in C89/99. Maybe start at https://lore.kernel.org/git/20352639-deaa-0e3f-c99e-9bde937d6...@gmail.co

[git-users] Re: Security Issue : Commit with any other user's email

2021-11-24 Thread Philip Oakley
A similar confusion occurred on the main Git list very recently (https://lore.kernel.org/git/710dc612-0e3f-bf10-b123-f9443e605...@gmail.com/). There are three types user 'security going on here/there.: 1. SSH security across the link between server and user 2. 'username & email' for the "signed

[git-users] Re: trouble syncing terminal

2021-11-05 Thread Philip Oakley
This sounds like you need, next, to look at the use of "Remotes". Remotes are other computers to the _one_ you are working on that you can communicate with via one of Git's interfaces to send and receive the difference between here, and the remote computer. The clone command is one simple exa

Re: [git-users] fatal: not a git repository

2021-11-05 Thread Philip Oakley
What's the link for the on-line course (should additional questions come up)? Is it public? On Friday, November 5, 2021 at 3:05:18 PM UTC Joe Sollers wrote: > Thank you guys I am using git online classes and am no coding guru but I > am working on a project that has led me to take a deeper dive

[git-users] Re: fatal: not a git repository

2021-11-05 Thread Philip Oakley
This " fatal: not a git repository" means the your git command (which is executed when you are at the particular file location shown in your terminal) cannot find an actual git repository somewhere in the file system hierarchy starting at your current location. You maybe one level above the repo

Re: [git-users] Integrating GIT with my own versioning system.

2021-10-31 Thread Philip Oakley
On 31/10/2021 18:35, skybuck2000 wrote: > > You do know you get automatic de-duplication because filename > metadata > is stored independently of content (blobs), so copied file > contents take > up zero room! > > > I am in doubt what this means. I take the blog theory of GIT wi

Re: [git-users] Integrating GIT with my own versioning system.

2021-10-31 Thread Philip Oakley
On 31/10/2021 18:35, skybuck2000 wrote: > > Git stores snapshots. It will > > > I may have noticed this. I did notice the GIT database can get quite > large. One example is PascalCoin... it's git database seems to be 100 > MB... it shouldn't be that big I think, I don't think the sources are >

Re: [git-users] Integrating GIT with my own versioning system.

2021-10-31 Thread Philip Oakley
A few follow ups. On 31/10/2021 17:57, skybuck2000 wrote: > > > the Git repo built. At least it gives a better overview, though the > diffs can be terrible. > > > Why were the diffs terribles to many code changes all at once ? Terrible in the sense that it was "all the code changes at once

Re: [git-users] Integrating GIT with my own versioning system.

2021-10-31 Thread Philip Oakley
On 31/10/2021 05:14, skybuck2000 wrote: > Anyway I hope to have convinced you somewhat that GIT is not ideal for > me, it's risky if something bad happens to it's database, it's > cumbersome to use, it's slow for that reason, lot's of overhead. What you know is almost always better that some rando

Re: [git-users] Integrating GIT with my own versioning system.

2021-10-31 Thread Philip Oakley
On 31/10/2021 05:14, skybuck2000 wrote: > My own versioning system is very simple and used for solo development > 99.9%. > > I will give an example of how this works. > > The main thing is "folders", "version number in folders" and "comments > in folders". > > For example, let's suppose I want

[git-users] Re: Error of the newest 2.33 for ssh key to Gerrit

2021-10-22 Thread Philip Oakley
there are full answers on the Git for Windows Issues pages. Some are 'closed', so remove the `is:open` from the filter ;-) https://github.com/git-for-windows/git/issues/3468 Summary, that encryption has been deprecated by one of the upstreams. There are work arounds, but do considere if you ca

Re: [git-users] Basic Git Questions

2021-10-13 Thread Philip Oakley
I (as an older engineer) like to compare the 'staging area' (aka index / cache) to the old style 'outbox' one may have had on ones desk or in the corner of the office where we would place completed paper memos for collection later. It gave us chance to carefully collate groups of memos, or amen

Re: [git-users] how *not* to push a certain branch but all others yes

2021-10-07 Thread Philip Oakley
On 07/10/2021 16:51, Uwe Brauer wrote: >> The inconvenience is that you need to remember to create your local branches >> using that convention (and rename current branches - which is easy to do by >> using the `git branch -M` command). > I admit I am confused: I thought I should use the same nam

Re: [git-users] Re: Feature Request: Recognizing which code belongs together and in what file and file segment it belongs.

2021-10-07 Thread Philip Oakley
On 07/10/2021 10:04, Magnus Therning wrote: > > skybuck2000 writes: > >> Here is a "real-world" example: >> >> The original repository is this one: >> https://github.com/PascalCoin/PascalCoin >> >> My restructured repository is this one: >> https://github.com/SkybuckFlying/PascalCoinRestructured >

Re: [git-users] cannot commit or pull

2021-09-16 Thread Philip Oakley
I'll throw in my visualisation if it's any help. It (Staging) is like having the old style "Out" tray at the edge of you desk where the mail person will collect all the packages when everything is ready, as a nice tied up bundle. It means you can prepare individual 'files' for the bundle and pu

[git-users] Re: Meta: Gmane newsgroup bi-directionality

2021-09-14 Thread Philip Oakley
Thanks for the clarification. I guess it's a Google (groups) related issue. The main Git list is organised via the kernel.org so probably has more flexibility. Others may know more... On Tuesday, September 14, 2021 at 1:37:13 PM UTC+1 Daniel Fleischer wrote: > The "gmane.comp.version-control.gi

[git-users] Re: Meta: Gmane newsgroup bi-directionality

2021-09-14 Thread Philip Oakley
Gmane's majordomo service for Git was taken off-line a few years ago because of legal troubles at the gmane service (right to delete issues IIRC). I believe it is still available as an nntp service. If you need to access old gmane based links to past Git List mailings then use the https://lo

[git-users] Re: Feature Request: Recognizing which code belongs together and in what file and file segment it belongs.

2021-09-12 Thread Philip Oakley
Have you looked at the various --pickaxe and other file-following options that can be set to different levels of similarity for the tracking of such splitting and changing. Sometimes the real problem is that the 'local' feature branch policies (i.e. your corporate way of doing things) can be in

[git-users] Re: Combining two repositories (Local)

2021-09-02 Thread Philip Oakley
Look up the --orphan options for brining in an independent line of development into your repository. You can then formally merge the two lines of development (hence you will then have two root commits). It is also possible to use `git replace` if they are to looking like they occurred in sequen

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

2021-09-02 Thread Philip Oakley
> 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

Re: [git-users] Change management practices

2021-09-01 Thread Philip Oakley
If you can avoid branching feat-2 from feat-1 then that is worthwhile if if allows an independent feat-2 to be released while feat1 is still in test. However if there is some shared code, then it's worth branching earlier within feat-1 before the feature-1 visible changes show up. It is there

[git-users] Re: Change management practices

2021-08-30 Thread Philip Oakley
Hi Shannon, Some thoughts: first a bit of cod-philosophy : we can't control or 'manage' change, all we can do is administer it, and add a bit of political spin ( Situation, Problem, Implication, and Need-payoff ). Lot's of managers think they have control, but we all know.. Git with it's 'DVCS

[git-users] Re: Restoring old version of directory tree with code

2021-08-19 Thread Philip Oakley
Have a look for the `-f|--force` option and the `--no-overlay` option (https://git-scm.com/docs/git-checkout), along with the `-- ` syntax (the `--` is space separated) if it is just a single directory from the commit (treeish) that's required. There is also the `git reset` command but that can

  1   2   3   4   5   6   7   8   >