Re: [git-users] Re: Feature Question: Versioning on sub-file level

2013-11-05 Thread Philip Oakley
This was also just asked on the git developer list... Sound like the discussion at http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217 http://thread.gmane.org/gmane.comp.version-control.git/237325/focus=237337 Philip - Original Message - From: mucaho To: git-users

Re: [git-users] git am "patch does not apply" on removed file

2013-11-10 Thread Philip Oakley
- Original Message - From: Ken Tanzer To: git-users@googlegroups.com Sent: Sunday, November 10, 2013 8:49 AM Subject: [git-users] git am "patch does not apply" on removed file Hello. I have some patches I was having problems with, and have boiled down a simple example. If I try to rem

Re: [git-users] git am "patch does not apply" on removed file

2013-11-10 Thread Philip Oakley
roblem, as git is able to both delete and recreate the file without problem. I'm still hoping for other explanation, but right now it seems like a bug to me... Ken On Sunday, November 10, 2013 3:36:48 AM UTC-8, Philip Oakley wrote: - Original Message - From: Ke

Re: [git-users] git am "patch does not apply" on removed file

2013-11-10 Thread Philip Oakley
rs list g...@vger.kernel.org (No HTML, plain text only) <\bike shedding> - Original Message - From: Philip Oakley To: Ken Tanzer ; git-users@googlegroups.com Sent: Sunday, November 10, 2013 11:03 PM Subject: Re: [git-users] git am "patch does not apply" on removed file Hi

Re: [git-users] GIT project maintainer as a developer

2013-11-18 Thread Philip Oakley
- Original Message - From: Greg Freeman To: git-users@googlegroups.com Sent: Monday, November 18, 2013 7:29 PM Subject: [git-users] GIT project maintainer as a developer I have an issue with my workflow that I'm trying to resolve. I am a developer as well as the project main

Re: [git-users] GIT project maintainer as a developer

2013-11-19 Thread Philip Oakley
- Original Message - From: Greg Freeman To: git-users@googlegroups.com Sent: Tuesday, November 19, 2013 6:39 PM Subject: Re: [git-users] GIT project maintainer as a developer Philip, thanks for the good response. One follow up question, should all of these branches be pushed

Re: [git-users] Re: git clean help

2013-11-23 Thread Philip Oakley
- Original Message - From: David R To: git-users@googlegroups.com Sent: Sunday, November 24, 2013 2:53 AM Subject: Re: [git-users] Re: git clean help ? On Wed, Nov 13, 2013 at 8:21 PM, David R wrote: im running it from the main directory, I believe, I havnt done

Re: [git-users] Re: Storing extra files in .git

2013-11-25 Thread Philip Oakley
Another option is to create an orphan branch specifically for your temporary workings, which can be deleted when its done with. Obviously a little bit of hackery would be needed for swapping between the current and orphan branch but it shouldn't be that hard. Philip (apologies for the top posti

Re: [git-users] Precise Definition of Repository

2013-12-11 Thread Philip Oakley
I think you are asking for a short definition... Clearly the code will speak the truth, but there is a lot of code and special cases, which makes for long definitions. A repository is the place that holds all your history data and meta-data about where you are up to. As a distributed version

Re: [git-users] how to delete a commit?

2013-12-19 Thread Philip Oakley
Have a look at 'git rebase', particularly the interactive (-i) option do note that the subsequent commits will have new sha1 values, and that rebase is 'changeset' oriented so simply dropping that commit will loose those changes. If you need to keep the changes but loose the commit, look up the

Re: [git-users] Git for MinGW & MSYS 64bit

2013-12-19 Thread Philip Oakley
Hi Jason, What's the licencing situation? I didn't see a COPYING file on the github. I'm presuming some form of open source, but which one ;-) Philip - Original Message - From: Jason Huntley To: git-users@googlegroups.com Sent: Thursday, December 19, 2013 7:25 PM Subject: [g

Re: [git-users] GIT - Case sensitive parameter?

2013-12-20 Thread Philip Oakley
maybe http://stackoverflow.com/questions/1039473/vb6-ide-is-changing-the-case-of-my-enumeration-names can help. There are a lot of discussions on this issue ! Philip - Original Message - From: Gabriel Angeli To: git-users@googlegroups.com Cc: Gabriel Angeli Sent: Friday, D

Re: [git-users] Re: Help, very strange behavior by Git

2013-12-21 Thread Philip Oakley
1. Have you managed to reproduce this on any other repos? 2. Is the repo, or a demonstrable fault variant, available publically? 3. What does a diff of the current state with its last commit say (i.e. what is the full detail hidden below the simple status)? 4. Are yo at least able to share the fil

Re: [git-users] Re: git clone on windows creates modified file

2013-12-22 Thread Philip Oakley
It does seem that adding an extra check during a Windows/case-insensitive checkout for 'duplicate' filemames would be a useful addition. P. - Original Message - From: joeriel...@gmail.com To: git-users@googlegroups.com Sent: Saturday, December 21, 2013 9:52 PM Subject: [git-us

Re: [git-users] Lost git metadata

2014-01-01 Thread Philip Oakley
My thoughts would be to immediately do a 'git init' on your local media, find a suitable .gitignore fom github, add it and all your appropriate files as the initial commit, and work from there until you get home. Then it's a case of grafting your travelling repo onto the home repo, followed by

Re: [git-users] File in master messed up after adding someone's topic

2014-01-03 Thread Philip Oakley
First, don't panic. Nothing is lost. It sound like the 'pull' workflow you are using, does not match the work style of the upstream project. A 'pull' does two things. First it fetches the appropriate updates (which git version/OS are you using?) from the upstream and stores them in the remote

Re: [git-users] File in master messed up after adding someone's topic

2014-01-04 Thread Philip Oakley
/docs/git-reset.html Philip - Original Message - From: nmac...@iburst.co.za To: git-users@googlegroups.com Cc: nmac...@iburst.co.za ; Philip Oakley Sent: Saturday, January 04, 2014 2:38 AM Subject: Re: [git-users] File in master messed up after adding someone's topic

Re: [git-users] File in master messed up after adding someone's topic

2014-01-05 Thread Philip Oakley
e to 'next'. " Hope that helps Philip - Original Message - From: nmac...@iburst.co.za To: git-users@googlegroups.com Cc: nmac...@iburst.co.za ; Philip Oakley Sent: Sunday, January 05, 2014 2:59 AM Subject: Re: [git-users] File in master messed up after add

Re: [git-users] File in master messed up after adding someone's topic

2014-01-05 Thread Philip Oakley
es being merged back into master, so they can be useful ;-) Anyway, I'll consider the problem solved. Glad to have helped. Philip - Original Message - From: nmac...@iburst.co.za To: git-users@googlegroups.com Cc: nmac...@iburst.co.za ; Philip Oakley Sent: Sunday, January

Re: [git-users] The right process of generating and merging patches?

2014-01-12 Thread Philip Oakley
- Original Message - From: Valerio Pachera To: git-users@googlegroups.com Sent: Sunday, January 12, 2014 5:48 PM Subject: [git-users] The right process of generating and merging patches? Hi all, this is my first topic in this group. I'm not professional programmer, I mostly

Re: [git-users] Submodules and clobbering history

2014-01-31 Thread Philip Oakley
From: Eric Reischer To: git-users@googlegroups.com Sent: Tuesday, January 28, 2014 11:16 PM Subject: [git-users] Submodules and clobbering history I have a fairly esoteric situation, but I suspect I'm probably not the only one who is attempting to do something along these lines. I hav

Re: [git-users] Upgrading Git version on server and/or local machines

2014-02-09 Thread Philip Oakley
The policy of the Git maintainer (Junio) on the main git list is to try very hard to ensure backward compatibility wherever possible. There will be some small changes, but from what I see, most folk manage OK with their older versions while still talking to newer server versions. Obviously you

Re: [git-users] Gitsu: User management and pairing for Git

2014-02-20 Thread Philip Oakley
Daniel It maybe worth adding this extra write up / clarifications into the various readme/descriptions. [sorry for the top post on these HTML formated messages] Philip - Original Message - From: drrb To: git-users@googlegroups.com Cc: Konstantin Khomoutov Sent: Thursday, F

Re: [git-users] Core dumps

2014-02-20 Thread Philip Oakley
From: "Dale R. Worley" To: Sent: Thursday, February 20, 2014 7:19 PM Subject: [git-users] Core dumps I'm getting core dumps from "git add" (git version 1.8.3.1). Are there known problems of that sort, or should I try to make up a decent bug report about it? Dale I had a quick look at th

Re: [git-users] Any commercial products for GIT?

2014-02-25 Thread Philip Oakley
- Original Message - From: Jirong Hu To: git-users@googlegroups.com Cc: Jirong Hu Sent: Tuesday, February 25, 2014 5:18 PM Subject: Re: [git-users] Any commercial products for GIT? You know management wants something has an official support. Ah, management, don't you jus

Re: [git-users] Git GSoC

2014-03-04 Thread Philip Oakley
Original Message - From: Adit Kabra To: git-users@googlegroups.com Sent: Tuesday, March 04, 2014 2:10 PM Subject: [git-users] Git GSoC Hi I'm interested to work for some Git project in the upcoming GSoC. I've also solved one of the microprojects which is a pre-requireme

Re: [git-users] Question about .gitignore

2014-03-10 Thread Philip Oakley
There are plenty of standard .gitignore files https://github.com/github/gitignore that projects commonly use to ensure that the flotsam and jetsam of failed compile runs don't entre the source code repo. Sometimes the binaries are required but it's worth separating the source from the binaries

Re: [git-users] How come forced push resulted in other branch being moved back?

2014-03-13 Thread Philip Oakley
Sounds like the user had not fetched the latest commits from the remote so that her/his local copy of that remote was behind and after the rebase he had lost those commits relative to the true remote, so when he force pushed his rebased branches the remote was rolled back. Philip [sorry for the

Re: [git-users] Undoable reset hard

2014-03-15 Thread Philip Oakley
From: "Johannes Müller" Hi, I tried thinking of a way to prevent accidental deletion by git reset --hard command, as I recently faced such a problem. How can you write a wrapper replacing the command, so that it first does something like the following? It should create a new branch backup wit

Re: [git-users] respect --color option on format placeholders

2014-03-16 Thread Philip Oakley
- Original Message - From: Alberto Fanjul Alonso To: git-users@googlegroups.com Sent: Sunday, March 16, 2014 10:38 AM Subject: [git-users] respect --color option on format placeholders I love to use git log from command line, exactly: git log --color --graph --oneline --d

Re: [git-users] Infinite spawning of "git status"

2014-03-21 Thread Philip Oakley
From: "Dale R. Worley" I ran into a failure which caused a "git status" process to spawn a child "git status" process, which spawned another "git status" child process, etc., for several dozen levels at least. Does anyone know what might cause this to happen? Dale Wild thoughts / just guessi

Re: [git-users] Infinite spawning of "git status"

2014-03-23 Thread Philip Oakley
From: "Dale R. Worley" From: "Philip Oakley" Wild thoughts / just guessing : Any sub-modules in your repo? Could be an accidental circular reference (within the various .gitmodules files) No, I'm definitely not using submodules. Could be a symlink somewher

Re: [git-users] git clone a directory into a new local directory with a new name

2014-03-25 Thread Philip Oakley
- Original Message - From: Michael Laird To: git-users@googlegroups.com Sent: Tuesday, March 25, 2014 5:35 PM Subject: Re: [git-users] git clone a directory into a new local directory with a new name Nelson, I am back to all the weirdness I had before. I uninstalled Git,

Re: [git-users] How do I find the branch of each parent of a merge commit?

2014-03-29 Thread Philip Oakley
- Original Message - From: Alex Rodrigues To: git-users@googlegroups.com Sent: Saturday, March 29, 2014 3:22 AM Subject: [git-users] How do I find the branch of each parent of a merge commit? I would like to find the branches that contributed to a commit that was the result

Re: [git-users] How do I find the branch of each parent of a merge commit?

2014-03-31 Thread Philip Oakley
- Original Message - From: Alex Rodrigues To: git-users@googlegroups.com Cc: Alex Rodrigues ; Philip Oakley Sent: Monday, March 31, 2014 8:56 PM Subject: Re: [git-users] How do I find the branch of each parent of a merge commit? Perhaps I should explain what I am trying

Re: [git-users] How do I find the branch of each parent of a merge commit?

2014-04-01 Thread Philip Oakley
- Original Message - From: Alex Rodrigues To: git-users@googlegroups.com Cc: Alex Rodrigues ; Philip Oakley Sent: Tuesday, April 01, 2014 8:40 PM Subject: Re: [git-users] How do I find the branch of each parent of a merge commit? Also found http://stackoverflow.com

Re: [git-users] git showing modified files right after branch chekout

2014-04-03 Thread Philip Oakley
Sorry for top post. The problem maybe 'unicode' in that autodetect on general unicode text (i.e. non US ASCII chars) will be detected as binary files rather than as text files, and somehow thus different (or treated different). In particular I believe it's that Git detects null bytes as an indic

Re: [git-users] What does "ai/topic_in_next" mean?

2014-04-08 Thread Philip Oakley
That describes the way that Junio, the maintainer, keeps track of all the different contributors. In this case "ai" is someone with the initials A I, and her/his contribution is held in that part of the refs directory. Thus if I make a contribution it appears under "po/my_topic". http://git-bl

Re: [git-users] Git error on push : refusing to update checked out branch

2014-05-04 Thread Philip Oakley
The error message says it all. The problem is that you have a non-bare repository. You cannot 'push' your personal content onto the content of the remote potentially overwriting someone elses work. A bare repository doe not have any work tree with checked out content, so you can't over write i

Re: [git-users] two git's on my local drive?

2014-05-06 Thread Philip Oakley
- Original Message - From: jjjsmith To: git-users@googlegroups.com Sent: Tuesday, May 06, 2014 7:51 PM Subject: [git-users] two git's on my local drive? Hi, I'm currently using git to update my production server. I have a copy of the source on my local hard drive, and i

Re: [git-users] strange issue related to rebase.

2014-05-12 Thread Philip Oakley
- Original Message - From: ta...@abdulradi.com To: git-users@googlegroups.com Sent: Monday, May 12, 2014 3:15 PM Subject: [git-users] strange issue related to rebase. I had one commit on my machine, but not on the remote repo yet. I wanted to pull and rebase before pushing

Re: [git-users] worlds slowest git repo- what to do?

2014-05-15 Thread Philip Oakley
From: "John Fisher" I assert based on one piece of evidence ( a post from a facebook dev) that I now have the worlds biggest and slowest git repository, and I am not a happy guy. I used to have the worlds biggest CVS repository, but CVS can't handle multi-G sized files. So I moved the repo to g

Re: [git-users] Which version of .gitattributes does git checkout use?

2014-05-15 Thread Philip Oakley
- Original Message - From: Sander Voerman To: git-users@googlegroups.com Sent: Thursday, May 15, 2014 8:21 PM Subject: [git-users] Which version of .gitattributes does git checkout use? Hi all, My question is this: if the .gitattributes file differs between branches, whic

Re: [git-users] Git file attributes

2014-05-20 Thread Philip Oakley
- Original Message - From: Severus To: git-users@googlegroups.com Sent: Tuesday, May 20, 2014 7:21 AM Subject: [git-users] Git file attributes Hi folks, I have used git for a long time, I found that when I change file attributes as chmod 755 file, git will mark as modifie

Re: [git-users] .gitattributes eol=crlf behavior

2014-05-28 Thread Philip Oakley
- Original Message - From: Richard Smith To: git-users@googlegroups.com Sent: Wednesday, May 28, 2014 4:49 PM Subject: [git-users] .gitattributes eol=crlf behavior We have some source files that are shared among windows/linux/macos. One of the IDE's (Keil ARM) doesn't have

Re: [git-users] Git extensions to use enhanced difference detection

2014-06-02 Thread Philip Oakley
- Original Message - From: Hugh Gleaves To: git-users@googlegroups.com Sent: Thursday, May 29, 2014 9:22 PM Subject: [git-users] Git extensions to use enhanced difference detection I'm newish to Git and see that it seems to do change detection using a line by line kind of al

Re: [git-users] Change commit messages after pushed on remote repository

2014-06-02 Thread Philip Oakley
- Original Message - From: Kimura Masayuki To: git-users@googlegroups.com Sent: Monday, June 02, 2014 3:23 AM Subject: [git-users] Change commit messages after pushed on remote repository Hi, I use git and Redmine for managing team task and development source code. When

Re: [git-users] git reset with staged changes

2014-06-03 Thread Philip Oakley
- Original Message - From: André Hänsel To: git-users@googlegroups.com Sent: Monday, June 02, 2014 7:48 AM Subject: [git-users] git reset with staged changes I just learned painfully that git reset --hard deletes any previously untracked files that have been staged. I had to

Re: [git-users] Re: git reset with staged changes

2014-06-05 Thread Philip Oakley
- Original Message - From: Pierre-François CLEMENT To: git-users@googlegroups.com Sent: Thursday, June 05, 2014 11:21 AM Subject: Re: [git-users] Re: git reset with staged changes Le mercredi 4 juin 2014 16:28:27 UTC+2, Dale Worley a écrit : Yeah, but what one *feels* is

Re: [git-users] Should I clone the whole repo if I want to edit one file only?

2014-06-07 Thread Philip Oakley
- Original Message - From: umair durrani To: git-users@googlegroups.com Sent: Friday, June 06, 2014 9:18 PM Subject: [git-users] Should I clone the whole repo if I want to edit one file only? I have a repo on bit bucket. It contains files related to my thesis. If I want to

Re: [git-users] Re: Git doc on custom commands

2014-07-14 Thread Philip Oakley
From: Thomas Ferris Nicolaisen Sent: Wednesday, July 09, 2014 9:02 AM On Monday, July 7, 2014 1:43:42 PM UTC+2, Giuseppe Manzo wrote: I red a few articles around the web on how to implement custom git commands, but I cannot find anything about in the official site or in the documentatio

Re: [git-users] short name for the remote

2014-07-14 Thread Philip Oakley
From: "Konstantin Khomoutov" Sent: Tuesday, July 08, 2014 3:59 PM On Mon, 7 Jul 2014 21:59:56 -0700 (PDT) dexter ietf wrote: often times i had to use origin/blabla to refer to my remote branch, i was wondering if there is a shortname for this, for example 'remote' may be it's already there

Re: [git-users] Roll back to old commit

2014-07-26 Thread Philip Oakley
Hi Luke, It can be hard to understand the different options that Git provides. It sounds like you are in a team which is using a set of branching and merging techniques that do not work together (like using Hammers and screws rather than hammers and nails ;-) In a team environment which has a

Re: [git-users] What does this line in git diff mean?

2014-07-29 Thread Philip Oakley
From: "juh" Hi, I don't understand two things in the output of git diff: $ git diff 8bdc f5fa diff --git a/text.md b/text.md index 4202174..6ef3a44 100644 --- a/text.md +++ b/text.md @@ -3,3 +3,4 @@ title: Foo author: Peter --- +Once upon a time... first, as I understand it

Re: [git-users] Question about git diff

2014-08-02 Thread Philip Oakley
From: Sreepathi Prasanna To: git-users@googlegroups.com Sent: Saturday, August 02, 2014 8:14 PM Subject: [git-users] Question about git diff Hello, I'm new to Git source control. I generated a patch using git diff > patch command, on one of the projects and submitted it to open

Re: [git-users] Merge+rebase diverged branches

2014-08-03 Thread Philip Oakley
From: Gergely Polonkai To: git-users@googlegroups.com Sent: Sunday, August 03, 2014 2:09 PM Subject: [git-users] Merge+rebase diverged branches Hello, I have two branches, master and table, both went through some changes and have their respective tracking brances: M1! - M2! - M3!

Re: [git-users] git clean vs git status re .gitignore

2014-08-22 Thread Philip Oakley
From: "Paul Smith" Sent: Friday, August 22, 2014 12:41 PM Subject: Re: [git-users] git clean vs git status re .gitignore On Fri, 2014-08-22 at 10:05 +0200, Magnus Therning wrote: On Thu, Aug 21, 2014 at 10:16:08PM -0400, Paul Smith wrote: >>> Does it seem incorrect to anyone else that "git cl

Re: [git-users] whats the difference?

2014-08-23 Thread Philip Oakley
From: eamira...@gmail.com would you please tell me what advantages will I get if I change our source control system from sourcesafe to git? I know about the differences but please tell me about the branching part!!!if we change similar files in our master code and they wont be done on our diffe

Re: [git-users] whats the difference?

2014-08-25 Thread Philip Oakley
Eli, please also reply to the list so others can learn from the answers.. We prefer 'bottom posting', go answers can be seen in context with the question - see below - Original Message - From: eli amiri To: Philip Oakley Sent: Sunday, August 24, 2014 8:06 AM S

Re: [git-users] git on user workstations? is that good?

2014-08-25 Thread Philip Oakley
From: guru prasad To: git-users@googlegroups.com Sent: Sunday, August 24, 2014 12:53 PM Subject: [git-users] git on user workstations? is that good? Version control novice here. Read through git docs, watched videos on git. One of the advantages being talked about is the ability to hav

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Philip Oakley
- Original Message - From: Torsten Bronger To: git-users@googlegroups.com Sent: Friday, August 22, 2014 12:24 PM Subject: [git-users] Cherry picking fails for obscure reasons Hallöchen! I try to merge two repos, yielding a flat (aka interleaved) history. I do this along

Re: [git-users] Git rebase command!

2014-08-26 Thread Philip Oakley
- Original Message - From: Gopi Naidu To: git-users@googlegroups.com Sent: Monday, August 25, 2014 10:29 AM Subject: [git-users] Git rebase command! getting the issue with git rebase command on HPIA machine bash-4.0$ git version git version 2.0.4 bash-4.0$ uname -a HP-UX B.11.31 U ia64

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Philip Oakley
From: Torsten Bronger To: git-users@googlegroups.com Cc: philipoak...@iee.org Sent: Wednesday, August 27, 2014 6:23 AM Subject: Re: [git-users] Cherry picking fails for obscure reasons Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley:  - Original

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-27 Thread Philip Oakley
From: Torsten Bronger To: git-users@googlegroups.com Cc: philipoak...@iee.org Sent: Wednesday, August 27, 2014 7:52 AM Subject: Re: [git-users] Cherry picking fails for obscure reasons Hallöchen! Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley:  From

Re: [git-users] Advice on how to structure branches

2014-09-17 Thread Philip Oakley
The classic article is http://nvie.com/posts/a-successful-git-branching-model/ and optionally, some supporting scripts https://github.com/nvie/gitflow Philip - Original Message - From: Tom Green To: git-users@googlegroups.com Sent: Wednesday, September 17, 2014 10:06 PM Sub

Re: [git-users] Shellshock

2014-09-26 Thread Philip Oakley
- Original Message - From: Jude To: git-users@googlegroups.com Sent: Friday, September 26, 2014 1:29 AM Subject: [git-users] Shellshock Many of us are going to be reading about Shellshock over the next couple of days and realizing that Git Bash has this vulnerability at the

Re: [git-users] git add --all --no-binaries

2014-10-02 Thread Philip Oakley
From: Constantine Tarasenkov Wouldn't be cool to have a flag that skips binary files on staging area? I'm pretty sure Git can detect binary files before the commit. Does someone knows other ways not including them automatically? Unfortunately --no-binaries is not a well defined operation... e.g

Re: [git-users] Combining multiple repositories into one

2014-10-16 Thread Philip Oakley
From: "Konstantin Khomoutov" On Thu, 16 Oct 2014 05:54:32 -0700 (PDT) Pierre-François CLEMENT wrote: > > I have a set of about a dozen git repositories, side by side in > > the same folder. But they aren't separate projects, conceptually > > they're one project. [...] > You can use `git subt

Re: [git-users] Trying to commit to branches from different local folders.

2014-10-17 Thread Philip Oakley
- Original Message - From: Martyn Leeper To: git-users@googlegroups.com Sent: Thursday, October 16, 2014 6:37 PM Subject: [git-users] Trying to commit to branches from different local folders. Hey everyone, I'm pretty new to Git. I've managed to do different things like p

Re: [git-users] Forked GIT repositary update

2014-10-26 Thread Philip Oakley
- Original Message - From: Jan Janovic To: git-users@googlegroups.com Cc: jano...@orava.sk Sent: Sunday, October 26, 2014 10:16 AM Subject: [git-users] Forked GIT repositary update Hello coleagues! I have basic experience with GIT and I'm wondering for long time, how t

Re: [git-users] Forked GIT repositary update

2014-10-26 Thread Philip Oakley
Also have a look at https://github.com/mhagger/git-imerge if it's a big merge. Not used it myself but has been reviewed on the main git list. See below for the question.. - Original Message - From: Philip Oakley To: git-users@googlegroups.com Cc: jano...@orava.sk ; Jan Ja

Re: [git-users] Email Usage

2014-11-07 Thread Philip Oakley
From: "Rodrigo Narvaez Leuridan" Hi, I was looking around the documentation trying to find for what and how does git uses my email address, and how it can be helpful for me this feature. I am reading the git documentation, for setup is recommendable to set a user.email, I know that this email

Re: [git-users] what is manifest file?

2014-11-11 Thread Philip Oakley
- Original Message - From: Naveen Shreevatsa To: git-users@googlegroups.com Sent: Monday, November 10, 2014 11:00 AM Subject: [git-users] what is manifest file? Hi GIT community, What is manifest file? what does it contain? what is it use? is it same as .plf file in p

Re: [git-users] On bash doing git add '' troubles

2014-11-14 Thread Philip Oakley
- Original Message - From: G B To: git-users@googlegroups.com Sent: Friday, November 14, 2014 4:29 PM Subject: [git-users] On bash doing git add '' troubles Hello, I posted on Stackoverflow http://stackoverflow.com/questions/26933761/python-sh-module-and-git-try-to-add-m

[git-users] Re: Cannot set the commit-message editor

2014-11-21 Thread Philip Oakley
From: "Fahad Ashfaque" I have downloaded the latest git from git-scm on my windows machine. I am using git on windows, I am having trouble trying to get notepad++ as my commit message editor. I have created a shell script called npp.sh which has the following content /c/Program\ Files\ \(x8

[git-users] Re: Cannot set the commit-message editor

2014-11-21 Thread Philip Oakley
sed in a config param ? I will try setting the core.editor to the value you suggested. On Fri, Nov 21, 2014 at 12:48 PM, Philip Oakley wrote: From: "Fahad Ashfaque" I have downloaded the latest git from git-scm on my windows machine. I am using git on windows, I am having trouble t

[git-users] How to show submodules in Gitk tree view?

2014-12-03 Thread Philip Oakley
In the gitk viewer one can select either patch or tree view of the currently selected commit. Is there a way of making the tree viewer show the submodules that are contained within the commit? At the moment it doesn't look like these are shown. I've verified that the top level tree does cont

Re: [git-users] How to show submodules in Gitk tree view?

2014-12-03 Thread Philip Oakley
From: "Philip Oakley" As a corollary, I'm uncertain how to search the DAG for those commits that change a specific submodule - a bit of brain fade... what would be a suitable G4W bash command? Unfaded brain... Philip@PHILIPOAKLEY /c/msysgit (master) $ git log -10 -- git I.

Re: [git-users] no .git folder when creating new repository

2014-12-05 Thread Philip Oakley
- Original Message - From: Aafaq Mateen To: git-users@googlegroups.com Sent: Thursday, December 04, 2014 3:22 PM Subject: [git-users] no .git folder when creating new repository Hi I down loaded the Git Windows version 1.9.4 and gave my name and email at bash and come

Re: [git-users] no .git folder when creating new repository

2014-12-05 Thread Philip Oakley
From: "Konstantin Khomoutov" On Fri, 5 Dec 2014 08:18:20 -0000 "Philip Oakley" wrote: - Original Message - From: Aafaq Mateen To: git-users@googlegroups.com Sent: Thursday, December 04, 2014 3:22 PM Subject: [git-users] no .git folder when creating n

Re: [git-users] Behavior of 'git clone --depth --no-single-branch' ? It's not doing at all what I expect.

2014-12-06 Thread Philip Oakley
Original Message - From: Stephen Morton To: git-users@googlegroups.com Sent: Friday, December 05, 2014 7:11 PM Subject: [git-users] Behavior of 'git clone --depth --no-single-branch' ? It's not doing at all what I expect. I'm trying to make a slice of a very large repo, di

Re: [git-users] Re: Installing Git in the local server

2014-12-06 Thread Philip Oakley
- Original Message - From: Waldek M. To: git-users@googlegroups.com Sent: Saturday, December 06, 2014 6:46 PM Subject: [git-users] Re: Installing Git in the local server Yes, of course you can.But.. there needs not be a "server" with Git. Once you have a git client, you're

Re: [git-users] how to add a file?

2014-12-22 Thread Philip Oakley
From: john clarkson To: git-users@googlegroups.com Sent: Sunday, December 21, 2014 3:05 PM Subject: [git-users] how to add a file? I'm a complete beginner with Git. I looked at the language reference for 'add': http://www.git-scm.com/docs/git-add I looked at one of the videos: "Git

Re: [git-users] Is version match using Linux server and Windows client necessary?

2015-01-01 Thread Philip Oakley
Mattias, A security bug was found recently. (Git for Windows) V1.9.4 etc.are all vulnerable particularly to public facing servers (as a vector for the bug). Have a look at http://git-blame.blogspot.co.uk/2014/12/on-cve-2014-9390-and-git-221.html http://git-blame.blogspot.co.uk/2014/12/git-1856-

Re: [git-users] Can I make `git merge` always conflict on file changes?

2015-02-08 Thread Philip Oakley
- Original Message - From: Barry Moore To: git-users@googlegroups.com Sent: Saturday, February 07, 2015 2:27 AM Subject: [git-users] Can I make `git merge` always conflict on file changes? Hey All, I posted this on stack overflow (see http://stackoverflow.com/questions/2

Re: [git-users] I'm looking for a GUI that displays branches properly

2015-02-08 Thread Philip Oakley
- Original Message - From: Michael Gersten To: git-users@googlegroups.com Sent: Saturday, February 07, 2015 12:47 AM Subject: [git-users] I'm looking for a GUI that displays branches properly I want a GUI for git that displays branches properly. Even if this is the only func

Re: [git-users] Hotfix in a develop/master branch model for old version

2015-02-16 Thread Philip Oakley
Original Message - From: bernd.petter...@gmail.com To: git-users@googlegroups.com Sent: Monday, February 16, 2015 8:52 AM Subject: [git-users] Hotfix in a develop/master branch model for old version I'm quite new to git. For a project I use git with a dev branch. If it

[git-users] developing Git in Visual Studio .. some fixes

2015-02-23 Thread Philip Oakley
Hello all Visual Studio users, I've put together some fixes [3] to the build support that generates a VS project (.sln and .vcproj files) for the Git project. These are based on VS2008 (express edition; still available;-) and the msvc-build script [2] that is included in the Msysgit project [

Re: [git-users] Why no git remote get-url origin?

2015-02-26 Thread Philip Oakley
- Original Message - From: Andrew Pennebaker To: git-users@googlegroups.com Sent: Thursday, February 26, 2015 4:10 PM Subject: [git-users] Why no git remote get-url origin? git-remote offers a set-url subcommand for setting a remote's URL: $ git remote set-url origin g...@

[git-users] Re: [msysGit] developing Git in Visual Studio .. some fixes

2015-02-28 Thread Philip Oakley
From: "Philip Oakley" Sent: Monday, February 23, 2015 9:32 PM Hello all Visual Studio users, I've put together some fixes [3] to the build support that generates a VS project (.sln and .vcproj files) for the Git project. These are based on VS2008 (express edition; still avail

[git-users] Re: [msysGit] developing Git in Visual Studio .. some fixes

2015-03-12 Thread Philip Oakley
Ping; Does anyone have any feedback attempting to use this updated script so that they can browse and compile git? Even, "I only got half way through" comments would be useful. Philip - Original Message - From: "Philip Oakley" To: "Git MsysGit" ;

Re: [git-users] Moving to GIT

2015-03-12 Thread Philip Oakley
- Original Message - From: William Lasiewicz To: git-users@googlegroups.com Sent: Thursday, March 12, 2015 8:24 PM Subject: [git-users] Moving to GIT We ran out of perforce licenses and some developers set up GIT. We now have GIT and Perforce. We are considering moving to

[git-users] Re: [msysGit] developing Git in Visual Studio .. some fixes

2015-03-13 Thread Philip Oakley
From: Yue Lin Ho To: msys...@googlegroups.com Cc: git-users@googlegroups.com ; philipoak...@iee.org Sent: Friday, March 13, 2015 1:33 AM Subject: Re: [msysGit] developing Git in Visual Studio .. some fixes Hi Philip Oakley: Philip Oakley於 2015年3月13日星期五 UTC+8上午4時26分11秒寫道

Re: [git-users] git clone dissociate switch

2015-03-13 Thread Philip Oakley
From: טמיר דניאלי The git-clone documentation on git-scm.com mentions the `--dissociate` switch that as far as I understand should perform `git repack -ad` followed by deleting the alternates file. Sadly I cannot find this switch in 1.9.4 nor in 1.9.5, Was this removed or never implemented

Re: [git-users] merge by changelist cherry pick

2015-03-13 Thread Philip Oakley
From: William Lasiewicz I am looking for a script to merge selected checkins from one branch to another. We have a script that does this in perforce, but we want to switch to git ( because its free) I am looking in to it and the cherrypick command looks like what I am lookng for. Develo

Re: [git-users] merge by changelist cherry pick

2015-03-14 Thread Philip Oakley
required, you simply have the 'fix' in-place) As I mentioned previously, the mind set of Git DVCS is not the same as older VCS systems. Why not look at how branching is done on the linux kernel, or the Git code itself. On Friday, March 13, 2015 at 4:35:07 PM UTC-7, Philip Oakle

Re: [git-users] GIT

2015-03-14 Thread Philip Oakley
From: "Dale R. Worley" William Lasiewicz writes: All I want to do it create a repository on the server, add some files locally from my machine, push and go to another machine and actually see those files. In any other tool, this is completly easy The Git command structure has grown over

Re: [git-users] Adding directories

2015-03-16 Thread Philip Oakley
From: Rustom Mody Hi Context is we're using git for collectively editing documents(mostly text ie not Word etc). Sharing is on bitbucket. There are also largish reference-docs -- downloaded pdfs etc that are referenced but not ours -- dont want these in the repo. So... If I mak

Re: [git-users] GIT command/plugin to create archive to send it for the code review

2015-03-17 Thread Philip Oakley
The other option is a 'git bundle' which transfers the latest changes since a designated cut point. (-;Posting-Top-for-Apologies) Philip - Original Message - From: Gergely Polonkai To: git-users@googlegroups.com Cc: Raluca Popa Sent: Tuesday, March 17, 2015 6:43 AM Subject

Re: [git-users] push or clone?

2015-03-22 Thread Philip Oakley
From: fpefpe Hello -- I just created a bare repo (say on github) and I want to get my local repo to for for the first time -- should I "push" or "clone" the local repo to remote report for the first time? Thanks It will depend on which you are connected to. If you are 'on the clone' t

  1   2   3   4   5   6   7   8   >