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 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

[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-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: 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

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 ``

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-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

[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

[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

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 - 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] 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

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

[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

[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: "\ 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

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: 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/

[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-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

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

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] 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 >

[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-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

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] 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] 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-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-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 ;-) >

[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] 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 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] 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

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-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

[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

[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: 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: 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: 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: 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: 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: 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: 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: 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

Re: [git-users] Can I get back local, un-added files that have been erased by a checkout?

2011-09-18 Thread Philip Oakley
From: "Ben Chang" Hi, hope someone can help ... I'm very confused ... I'm using git-gui on windows. I created a new file in my project source directory. I'm fond of it - in fact it is the successful culmination of months of work - so I decide I want to keep it. I fire up Git-Gui. My new fil

Re: [git-users] Search for the instrument with the possibility of sharing rights.

2011-09-21 Thread Philip Oakley
From: "PavelVDobryakov" Hello, please tell me - is-there any tool to implement the separation of user rights to groups of users, the rights to the branches, repositories? Gitolite is the tool that comes up as the one to use. Philip -- You received this message because you are subscribed to th

Re: [git-users] gsoc 2012 project

2012-03-21 Thread Philip Oakley
From: "Raman Gupta" Sent: Wednesday, March 21, 2012 4:14 PM Raman, The g...@vger.kernel.org would be the right list for the GSoC '12 discussions. There are already plenty of discussions on that list http://news.gmane.org/gmane.comp.version-control.git Philip Hello everybody, I am a second

Re: [git-users] feasibility and implementation of a tree-structured development process

2012-04-23 Thread Philip Oakley
Achieving such a change is a often more of a social problem than a technical one... From: "Tom Roche" Sent: Monday, April 23, 2012 1:06 AM summary: background, motivation, and plan for a tree-structured development process is presented. My question is (roughly), should the "code bucket" to whi

Re: [git-users] Cannot update git from 1.7.5.4 OSX Lion

2012-05-09 Thread Philip Oakley
Check you don't now have two versions installed, and you default execution path/icon may still be pointing to the old one. Also confirm that you have simply installed Git for Windows (the executable in c:\program files), rather than the Msysgit development environment. I've ended up with vario

Re: [git-users] Re: Basic question: confusing messages with git merge

2012-05-10 Thread Philip Oakley
From: Brad Malone To: git-users@googlegroups.com Sent: Thursday, May 10, 2012 5:07 PM Subject: Re: [git-users] Re: Basic question: confusing messages with git merge Thomas and Antony, Thank you both for taking time to write such detailed responses to my question! Now let me get to

Re: [git-users] Submodule commit of different branch

2012-05-18 Thread Philip Oakley
- Original Message - From: Adros To: git-users@googlegroups.com Sent: Thursday, May 17, 2012 8:14 AM Subject: [git-users] Submodule commit of different branch Hello, is it possible to find out, which commit of submodule is a branch I am not currently on pointing t

Re: [git-users] Merge Conflict

2012-05-22 Thread Philip Oakley
From: "Andrew Hardy" Sent: Tuesday, May 22, 2012 6:59 PM I have changed the git ignore file to ignore *.suo however I had a *.suo file which will not merge from one branch to another because it is binary. So i deleted it from the "merge to" branch thinking this would allow me You need to

Re: [git-users] How to make a new branch with a portion of a branch?

2012-06-17 Thread Philip Oakley
From: "Eric Parent" Sent: Sunday, June 17, 2012 2:12 PM Hi, I've been working on a branch, say '2.1' and made a few commits on it. We've made a release and tagged the changeset at which the commit was produced, say 'tag2.1'. Development continued and a few more commits were made on that br

Re: [git-users] Re: Documentation discrepancy

2012-06-24 Thread Philip Oakley
From: "Konstantin Khomoutov" To: Cc: "Git User" Sent: Friday, June 22, 2012 2:40 PM Subject: Re: [git-users] Re: Documentation discrepancy On Thu, 21 Jun 2012 18:06:29 -0700 (PDT) Git User wrote: Thank you. Here is what I meant: echo alpha > a.txt add a.txt echo beta > b.txt add b.txt ech

Re: [git-users] how to merge to separate repositories.

2012-06-28 Thread Philip Oakley
You can use Grafts as a method for linking between the two repos to give the appearance that the history is continuous [apparently it was used for adding the early Linux history]. This does not change any of the sha1 values so their use in validating the complete history won't be valid. Also pro

Re: [git-users] Re: git commit -t won't let me use other template

2012-07-09 Thread Philip Oakley
A template is not a message. Rather it is guidance that needs to be edited. If the editor doesn't start, or you don't edit the words then it will be ignored by git. There has been some recent discussions and patches on the main list to see about changing the warning messages to make it all c

Re: [git-users] Re: Italian Translation of the documentation

2012-07-09 Thread Philip Oakley
Hi Jiang Xin coordinates the localisation (l10n) of the git messages. Have a look on the main git archive e.g. http://git.661346.n2.nabble.com/ or http://news.gmane.org/gmane.comp.version-control.git for some of the discusions. e.g. the latest request http://thread.gmane.org/gmane.comp.versio

Re: [git-users] "git checkout ." overwrites all my changes

2012-07-12 Thread Philip Oakley
Your command says "please checkout every file I have from the index", so [almost] obviously it won't warn you, as you explicitly requested all files be checked out - it's more obvious if you ask "git checkout myfile" (obvious overwrite), and then think about what '.' means as a replacement for

Re: [git-users] Beginner stuck in a commit

2012-08-06 Thread Philip Oakley
- Original Message - From: Jeffery Brewer To: git-users@googlegroups.com Sent: Tuesday, August 07, 2012 3:57 AM Subject: [git-users] Beginner stuck in a commit I've slowly been trying to get git to work and just running into loads of problems. Using the windows bash I

Re: [git-users] Server Error or User Error?

2012-08-14 Thread Philip Oakley
- Original Message - From: stewpend0us To: git-users@googlegroups.com Sent: Tuesday, August 14, 2012 1:14 AM Subject: [git-users] Server Error or User Error? Tried to create a repository on a network drive which caused git to freeze. Always froze on the "git add ." comman

Re: [git-users] Size of cloned git subtrees - only history / files for subtree needed

2012-08-30 Thread Philip Oakley
Isn't a shallow clone a good use case for this? You only need the latest commit of each project you want to build and then it either works or it doesn't, and the clone is then deleted. So is 'git clone --depth ' what you need? Use := 1 Just a thought Philip - Original Message -

[git-users] Re: Size of cloned git subtrees - only history / files for subtree needed

2012-08-30 Thread Philip Oakley
a small xyz project on a remote > machine. > > Why can I not directly clone xyz remotely and get the same result as with > the local clone? > > Am Donnerstag, 30. August 2012 09:00:04 UTC+2 schrieb Philip Oakley: > > > > > > >  Isn't a shallow clone a good

[git-users] Re: Size of cloned git subtrees - only history / files for subtree needed

2012-08-30 Thread Philip Oakley
file that > contains everything. Interestingly, when cloning locally via ssh git again > repacks and gives me a new pack file. > > Any ideas how I can force the repacking when cloning? > > Am Donnerstag, 30. August 2012 14:18:51 UTC+2 schrieb Philip Oakley: > > > > >

Re: [git-users] Automatic repacking when cloning

2012-09-03 Thread Philip Oakley
From: "Konstantin Khomoutov" Sent: Monday, September 03, 2012 7:29 PM On Mon, 3 Sep 2012 10:51:30 -0700 (PDT) Haasip Satang wrote: I'm having a question regarding the packs and the repacking of those during cloning. [...] On this big repo I created various subtree branches so I can clone so

Re: [git-users] git checkout " silently fails

2012-09-04 Thread Philip Oakley
If both cases of checking out a path you are expected to provide a , not a . The git glossary says that a tree-ish is a commit, tree, or tag - nothing about a branch. The corner case is probably hidden inside that aspect of the wording. If you can think of a succinct phrase that would clarify

Re: [git-users] Looking for a reccommendation of a GUI git interface for Windows

2012-09-11 Thread Philip Oakley
- Original Message - From: Lars Pensjö To: git-users@googlegroups.com Cc: Lars Pensjö Sent: Tuesday, September 11, 2012 8:04 PM Subject: Re: [git-users] Looking for a reccommendation of a GUI git interface for Windows A little confusing. http://code.google.com/p/gitexte

[git-users] Re: Looking for a reccommendation of a GUI git interface for Windows

2012-09-12 Thread Philip Oakley
On Tuesday, 11 September 2012 03:39:18 UTC+1, dmanexe wrote: > > Hello, I am rolling out a git solution for one of my clients, but they're > running Windows and I cannot think of a good GUI git client for Windows. > The client wants to use git, and wants a GUI client, but doesn't want to > pic

Re: [git-users] unix / windows EOL

2012-09-13 Thread Philip Oakley
From: fpefpe To: git-users@googlegroups.com Sent: Thursday, September 13, 2012 2:30 AM Subject: [git-users] unix / windows EOL Hello -- Is there an option or switch for git to handle files created on windows that have a EOL where files on unix have Yes. Though it can be 'com

Re: [git-users] Changed but not updated and Changes not staged for commit

2012-09-16 Thread Philip Oakley
From: Ivan Ionut To: git-users@googlegroups.com Sent: Sunday, September 16, 2012 7:06 PM Subject: [git-users] Changed but not updated and Changes not staged for commit Well after i modified a file... after git status: # Changes not staged for commit: # (use "git add ..." to updat

Re: [git-users] GIT MALWARE

2012-09-17 Thread Philip Oakley
On Monday, September 17, 2012 1:48:33 PM UTC+1, Ex wrote: > > > And the email was: g...@vger.kernel.org The git@vger mailing list is actually for Git (linux) source, and only accepts plain text mail. Any HTML mail is unceremoniously binned by the vger host (which covers lots of lists). That

Re: [git-users] Creating an up-to-date version of master branch on network drive

2012-09-21 Thread Philip Oakley
From: "Bart Baker" Hello, What I'd like to do is have a copy of the code that always sits on a shared drive visible to multiple users. I have a situation where users who don't use Git would like to occasionally view the code base without editing it. Could I somehow have the centralized push

Re: [git-users] Forcing a "push" from one branch to another

2012-09-25 Thread Philip Oakley
From: Chris Stankevitz To: git-users@googlegroups.com Sent: Tuesday, September 25, 2012 7:31 PM Subject: [git-users] Forcing a "push" from one branch to another Hello, If possible please humor me and attempt to answer this question: How do I make "b" look exactly like "a" usin

Re: [git-users] Forcing a "push" from one branch to another

2012-09-25 Thread Philip Oakley
From: Chris Stankevitz To: git-users@googlegroups.com Cc: Chris Stankevitz ; Philip Oakley Sent: Tuesday, September 25, 2012 8:01 PM Subject: Re: [git-users] Forcing a "push" from one branch to another On Tuesday, September 25, 2012 11:48:25 AM UTC-7, Philip Oakley wro

Re: [git-users] “Ghost” commit

2012-09-29 Thread Philip Oakley
--- Original Message - From: Thiago Rossi To: git-users@googlegroups.com Sent: Saturday, September 29, 2012 1:55 AM Subject: Re: [git-users] “Ghost” commit Thank you very much for the links. Actually I've read a few pages of the book recently… And I think I understand the part

Re: [git-users] to install git at bluehost

2012-09-30 Thread Philip Oakley
The x.x is a shorthand for the many incremental and minor development updates. However, the main storage has moved. "The release tarballs are found at: http://code.google.com/p/git-core/downloads/list"; Junio Hamano, the maintainer, announces the new and maintenance releases on g...@vger.k

Re: [git-users] Problem while adding a submodule from an empty repo

2012-09-30 Thread Philip Oakley
I didn't fully understand all the screen shots (e.g.which came first), but I did notice you had a --bare repo at one stage. Obviously (?) you can't do any work in such a repo as it has no working directory, and so you couldn't add a sub-module to it. I'd suggest you at least get the initial com

Re: [git-users] git-bisect creating modified files?

2012-10-05 Thread Philip Oakley
- Original Message - From: Manu Sridharan To: git-users@googlegroups.com Sent: Friday, October 05, 2012 4:23 PM Subject: [git-users] git-bisect creating modified files? Hi all, I'm having a strange issue with git-bisect, where the bisection process seems to create file

Re: [git-users] Re: git can't push a specific link file to the remote server??

2012-10-06 Thread Philip Oakley
The Mac OS HFS mangles various non-ascii characters. So what you put in and what you get back (filenames) don't always match because the encodings and composings of special characters changes. There is an upgrade to git going through at the moment that will cononicalise [make consistent] the f

Re: [git-users] git clone algorithm

2012-10-09 Thread Philip Oakley
From: "Konstantin Khomoutov" On Tue, 9 Oct 2012 09:35:03 -0700 (PDT) Cristea Bogdan wrote: I am wondering what algorithm is used by git clone command ? When cloning from remote repositories, if there is a link failure and the same command is issued again, the process should be smart enough to

Re: [git-users] Unable to push

2012-11-05 Thread Philip Oakley
Is your remote a 'bare' repository, or does it have a working directory? -- I ask because you say you are working on the branch on both sides. It is normal to have your remote as a 'bare' repo, though you can manage if both are 'working' but in such cases you would use different branches on the

Re: [git-users] GIT commercial licence

2012-11-13 Thread Philip Oakley
Git is actually licenced under the Lesser GPL, that is V 2.0 as described in the COPYING file of the source code (e.g. see Github) In general this means that it can be used by commercial companies in the same manner as Linux is used. Philip - Original Message - From: Srinivas reddy

Re: [git-users] GIT commercial licence

2012-11-14 Thread Philip Oakley
https://github.com/git/git/blob/master/COPYING - Original Message - From: Philip Oakley To: Srinivas reddy kukunoor ; git-users@googlegroups.com Sent: Wednesday, November 14, 2012 12:53 AM Subject: Re: [git-users] GIT commercial licence Git is actually licenced under the

Re: [git-users] deletion of git "object"?

2012-11-26 Thread Philip Oakley
From: John McKown To: git-users@googlegroups.com Sent: Monday, November 26, 2012 6:07 PM Subject: [git-users] deletion of git "object"? OK, this is more a question to help me understand git internals than an actual problem that I am having. But suppose I create a new branch. "git chec

Re: [git-users] Pushing files into a subtree

2012-11-29 Thread Philip Oakley
From: "Dale R. Worley" To: Sent: Thursday, November 29, 2012 7:50 PM Subject: Re: [git-users] Pushing files into a subtree From: Ryan Hodson If you're not looking for a submodule, you can just move the tracked files into a subdirectory with 'mv' or through your file browser. Then run 'git

Re: [git-users] Where to file bug reports???

2012-12-06 Thread Philip Oakley
The g...@vger.kernel.org is the right address for the main git developer list. HOWEVER it does require you to send plain text messages. All HTML is rejected out of hand by the vger.kernel.org lists. It's archive is on http://news.gmane.org/gmane.comp.version-control.git If you are Git for Windo

Re: [git-users] How to list a directory content with Git or GitHub

2012-12-08 Thread Philip Oakley
git-ls-files - Show information about files in the index and the working tree (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])* - Original Message - From: Fanta To: git-users@googlegroups.com Sent: Saturday, December 08, 2012 4:03 PM Subject: [git-users] How

Re: [git-users] securing data in a non-local repository

2012-12-11 Thread Philip Oakley
- Original Message - From: John McKown To: git-users@googlegroups.com Sent: Tuesday, December 11, 2012 7:44 PM Subject: [git-users] securing data in a non-local repository I haven't seen anything like this in anything I've read so far. And I know that git is all about free

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Philip Oakley
From: "Dale R. Worley" Sent: Wednesday, December 12, 2012 5:48 PM From: "Philip Oakley" > Another question is this: I believe that the complete repository > and > its status lives in the .git directory. So if I move ./.git to > ../.git, > it has th

Re: [git-users] Pushing files into a subtree

2012-12-12 Thread Philip Oakley
From: "Dale R. Worley" Sent: Wednesday, December 12, 2012 5:46 PM From: "Philip Oakley" > OK, so it seems that when you move files around, and then tell git > to > notice that, git will automagically figure out what the moves were. > The O'Reilly bo

Re: [git-users] interesting? observation about "git mv" propagation

2012-12-13 Thread Philip Oakley
If I understand correctly [*1*] what you did during this "Pull" was to get the data from your home bare repo to your work machine for git to decode, and then for git to feed the results back to your home working repo, so taking a full ssh round trip (ssh encoded both ways). That is, you maybe t

Re: [git-users] GIT get corrupted on lustre filesystem

2012-12-23 Thread Philip Oakley
From: "Konstantin Khomoutov" Sent: Sunday, December 23, 2012 6:26 PM On Sun, 23 Dec 2012 07:17:30 -0800 (PST) Eric Chamberland wrote: we are experiencing many problemes like those described here: http://thread.gmane.org/gmane.comp.file-systems.lustre.user/12093 Does anyone has an idea on ho

Re: [git-users] Keep local repo small

2012-12-23 Thread Philip Oakley
From: Francesco Rugiano To: git-users@googlegroups.com Sent: Sunday, December 23, 2012 8:57 PM Subject: [git-users] Keep local repo small Hello I have a question and i didn't manage to get an answer. I am in this situation: Remote repository - hosted on bitbucket Local reposito

Re: [git-users] Help! Git pull deleted files.

2012-12-28 Thread Philip Oakley
My guess would that you did a 'commit amend' (or small rebase) locally that slightly changed your line of development relative to your last push. As far as the git sha1 hash is concerned a slight change and a ginormous change are the same 'they are different'! - Original Message - F

Re: [git-users] Problem with moving everything into a subdirectory; merge conflicts

2013-01-06 Thread Philip Oakley
Surley (?) the simplest method, given your limited number of branches, is to capture and repeat the moves as a script once for each branch, so that each branch has a flag day commit. Then the development merging should proceed just fine. At least then the file rename machinery has much less to

Re: [git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-06 Thread Philip Oakley
conflicts Hi Philip, Am 2013-01-06 14:59, schrieb Philip Oakley: Surley (?) the simplest method, given your limited number of branches, is to capture and repeat the moves as a script once for each branch, so that each branch has a flag day commit. Then the development merging should proceed

Re: [git-users] Re: Problem with moving everything into a subdirectory; merge conflicts

2013-01-07 Thread Philip Oakley
From: "Carsten Fuchs" Sent: Monday, January 07, 2013 9:21 AM Hi Philip, Am 2013-01-06 18:21, schrieb Philip Oakley: Your issue [my mistake] is that the (gits's) merge process is a three way merge, so you have the two commits F and N to merge, but git will also locate the

Re: [git-users] Management of a puppet tree and multiple developers

2013-01-08 Thread Philip Oakley
More people essentially means you will want more branches (complexity got just too big for the two branch model), probably one per feature, branched off devel and re-merged [either feature -> devel; or devel(latest) ->feature depending on flow] whenever a feature is ready for testing. Once a fe

  1   2   3   4   5   6   7   8   >