[git-users] Re: Gui choose files to add and remove like in tortoise

2014-11-06 Thread Pierre-François CLEMENT
On Thursday, 30 October 2014 09:31:13 UTC+1, Mint Deville wrote: Hi, is there a function in the gui to show all files, and select files to add or ignore like it would work in tortoise? I need to be very selektive what files to add and ignore. For example I want some DLLs with device

[git-users] Re: Why am I getting You have more than one commit that you are about to submit. ?

2014-11-06 Thread Pierre-François CLEMENT
On Friday, 31 October 2014 10:03:11 UTC+1, wkevin wrote: After doing git pull and getting merge patches, and then trying to add my changes, prepare a patch, commit it and run git-review -f master (I am working with gerrit), I am getting this message: git-review --dry-run -f master You

[git-users] Re: What's wrong with git log --grep?

2014-11-06 Thread Pierre-François CLEMENT
On Friday, 10 October 2014 11:18:36 UTC+2, Marat Shakurov wrote: I doing: git log -p and see that optput contains string '*somestring1*' I doing: git log -p --grep=somestring1 or git log -p --grep=somestring1 -i or git log -p --grep=somestring1 -i F and use qoutation marks to

Re: [git-users] fatal unresolved deltas error

2014-11-06 Thread Pierre-François CLEMENT
On Wednesday, 5 November 2014 18:08:57 UTC+1, Anjib Mulepati wrote: I am not able to post on git at http://vger.kernel.orgvger.kernel.org That mailing list doesn't accept HTML emails, so make sure you send a text one otherwise it'll just get rejected. If a fresh clone can't fix your

[git-users] Re: Git upgrade to latest version to support stash

2014-11-03 Thread Pierre-François CLEMENT
On Tuesday, 28 October 2014 10:34:26 UTC+1, Manjunath Kashyap wrote: We've been running git 1.7.2 on staging/production server (Linux), We are planning to upgrade the existing GIT to latest version. My main preoccupations are that we've got a number of ongoing projects that are all in

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

2014-10-16 Thread Pierre-François CLEMENT
On Tuesday, 14 October 2014 17:11:05 UTC+2, Richard Kennaway 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. This is an obviously insane arrangement, but never mind how it got like

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

2014-10-16 Thread Pierre-François CLEMENT
On Thursday, 16 October 2014 11:42:01 UTC+2, Konstantin Khomoutov wrote: On Tue, 14 Oct 2014 08:11:04 -0700 (PDT) Richard Kennaway richard@gmail.com javascript: wrote: I have a set of about a dozen git repositories, side by side in the same folder. But they aren't separate projects,

[git-users] Re: What's wrong with git log --grep ? How I can find a 'somestring1' in a whole log of the project's commits?

2014-10-13 Thread Pierre-François CLEMENT
On Friday, 10 October 2014 11:01:03 UTC+2, Marat Shakurov wrote: how I can find a 'string' in a whole log of the project's commits I know there is: git log -p --grep=string and some options I don't know as correctly it to use I absolutely know, that the log of my project contains the

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

2014-10-09 Thread Pierre-François CLEMENT
On Sunday, 9 February 2014 00:43:35 UTC-6, Seb wrote: I've been running git 1.7.6 on both my local machines (osx) and my staging/production server (Linux/Ubuntu), the central repo is held on Assembla. I just bought a new server (Linux/CentOS) and was wondering what gremlins I should

Re: [git-users] any suggestions for pruning all upstream branches after a github fork?

2014-10-03 Thread Pierre-François CLEMENT
On Friday, 3 October 2014 07:28:48 UTC+2, Sam Roberts wrote: On Wed, Oct 1, 2014 at 12:40 AM, Thomas Ferris Nicolaisen tfn...@gmail.com javascript: wrote: On Tuesday, September 30, 2014 8:49:11 PM UTC+2, Sam Roberts wrote: How about this approach: (The thing is to avoid GitHub's

[git-users] Re: BASH Update in Windows GIT for recent BASH Exploit

2014-09-27 Thread Pierre-François CLEMENT
On Thursday, 25 September 2014 18:18:13 UTC+2, John Beaver wrote: http://seclists.org/oss-sec/2014/q3/650 How can I update the bash my self or do I need to wait for a new download? Good question, but I don't think it belongs to this group as it's not git specific but rather

[git-users] Re: removing old history from the archive

2014-09-24 Thread Pierre-François CLEMENT
On Tuesday, 23 September 2014 07:28:34 UTC+2, Michael Mossey wrote: I'm very new to git, and so far I'm using it more like a system to back up files and transfer them from computer to computer, no branching or anything complicated yet. In one directory tree, most of my files are binary

[git-users] Re: Modifying merge and squash commits in a subtree using hooks

2014-09-22 Thread Pierre-François CLEMENT
On Friday, 19 September 2014 07:16:50 UTC+2, vineet naik wrote: Hi, We use a commit-msg hook to add ChangeId (for gerrit) in each commit msg. Now I want to ensure that it's also added in merge and squash commits created as a result of `git subtree ... --squash`. So I tried using

[git-users] Re: GUI seems to be missing

2014-09-22 Thread Pierre-François CLEMENT
On Saturday, 20 September 2014 17:26:12 UTC+2, Joanna Gunst wrote: HI, Newbie here and probably with a dumb question but... I thought I had just installed Git on my home computer but all I am getting is the code window. I did configure the name and email as suggested but I still do not have

[git-users] Re: Bare repo Vs Working repo on hosting server

2014-09-22 Thread Pierre-François CLEMENT
On Saturday, 20 September 2014 11:02:26 UTC+2, Tom Hopcraft wrote: Hi, I have just moved host and my old git setup was to have a working repo on the server and then clone that working repo locally. I also run Wordpress and when I upload files through Wordpress this would add files to the

[git-users] Re: ssh keys

2014-09-15 Thread Pierre-François CLEMENT
On Tuesday, 9 September 2014 10:48:23 UTC+2, jo...@norricorp.f9.co.uk wrote: Hi, I have run ssh-keygen to generate a rsa key which I pasted to the authorized_keys file fore the git user on the git server. And all works, I can run git pull and push commands without being asked for a

[git-users] Re: How can i write a script to push my commit in a live production site?

2014-09-15 Thread Pierre-François CLEMENT
On Friday, 12 September 2014 07:56:54 UTC+2, Bryan Bojorque wrote: I setup gitolite on my server, I can push commits to my bare and pull from it. However when im done testing it on my dev page I want to try to push to to live production server which is located in /var/www. How do I

[git-users] Re: git checkout -t: better error

2014-09-15 Thread Pierre-François CLEMENT
On Friday, 12 September 2014 21:44:50 UTC+2, Andrew Pennebaker wrote: Could we improve the error message for `git checkout -t`? Sometimes I forget to type the remote name. Something like: Missing remote or branch name; try -b This group is for helping people with using Git; for change

[git-users] Re: git repository from windows to linux

2014-09-15 Thread Pierre-François CLEMENT
On Sunday, 14 September 2014 15:06:08 UTC+2, Robert Polanski wrote: Hi, I have changed system from windows to linux. In project we use GIT. The question is: can I move the project directory (containing source and .git directory) to linux and still use without problems or I have to

[git-users] Re: Identify added/changed lines since a specific commit

2014-09-09 Thread Pierre-François CLEMENT
Le samedi 6 septembre 2014 15:26:36 UTC+2, gituser a écrit : Hey, I am wondering if it's possible to determine if a specific line in the code (of the curent version of a file) was added or changed after a specific commit? Regards :) Hey, yes it is. You can use git-log's *pickaxe

[git-users] Re: Breakage in UMTSFemto GIT repository

2014-08-19 Thread Pierre-François CLEMENT
On Friday, 8 August 2014 18:11:35 UTC+2, ab wrote: Hi all, I am trying to create a GIT clone and followed below steps 1. Set Environment Variables a. export PATH=/auto/mitg-sw/tools/debian/git/bin:/auto/mitg-sw/tools/bin:$PATH 2. Generate Keys a. ssh-keygen -t

[git-users] Re: Need to find out when a tag is pushed to a git server

2014-08-11 Thread Pierre-François CLEMENT
I didn't really get the question except for the any [...] way to find out when a tag is pushed [...]? part, so that's the part I'm gonna answer. You can have a look at the update git-hook http://git-scm.com/docs/githooks for accomplishing this. Basically, if the refname (the first parameter

[git-users] Re: Issues on the Git reference site need fixing

2014-07-28 Thread Pierre-François CLEMENT
On Tuesday, 22 July 2014 17:51:13 UTC+2, Mickey Kay wrote: *2. Support email doesn't work* I tried to email this issue to the listed support email, g...@vger.kernel.org, however I got a permanent failure auto-response. Any idea who needs to know about this one? Sounds odd, the mail

[git-users] Re: Submodul with push

2014-07-28 Thread Pierre-François CLEMENT
On Sunday, 27 July 2014 18:00:51 UTC+2, Philipp Kraus wrote: Hello, I have got a large project and configure some Git submodules and include them into the main project: mainproject |submodul 1 |submodul 2 The submodule are based on a unique commit (hash). My question is,

[git-users] Re: How did I make this mess?

2014-07-11 Thread Pierre-François CLEMENT
On Thursday, 10 July 2014 18:28:01 UTC+2, Joe Strout wrote: I joined a project yesterday that's using git for their version control. I pulled down the repo, changed one file, and added several new ones. Everything was in good shape and ready to share with the team. So, on the advice of

[git-users] Re: Git sub modules

2014-06-27 Thread Pierre-François CLEMENT
On Thursday, 26 June 2014 09:23:39 UTC+2, chunnu wrote: Hi, I m new to git repository, with a star team back ground. In my project I have something called sub modules. I understand that these are a single repository in the git used by 5 different projects. But I m very confused about

[git-users] Re: Submodules, subtrees or something else?

2014-06-27 Thread Pierre-François CLEMENT
On Thursday, 26 June 2014 15:19:23 UTC+2, Bojan Stankovic wrote: Hello! I have a situation with a larger project that has lots of modules/libraries with their respective repos. Most of these modules are dependencies of other modules which are than dependencies of a project. And now it

[git-users] Re: git pull-push ?

2014-06-26 Thread Pierre-François CLEMENT
Le mercredi 25 juin 2014 13:15:23 UTC+2, Konstantin Khomoutov a écrit : The imaginary `git pull-push` has no sense as `git pull` might legitimately result in a merge conflict. Note that `git pull` is a sort of macro for `git fetch` + `git merge` which just makes certain (rather strong)

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Pierre-François CLEMENT
Le jeudi 26 juin 2014 13:04:18 UTC+2, Konstantin Khomoutov a écrit : On Thu, 26 Jun 2014 01:44:34 -0700 (PDT) Pierre-François CLEMENT lik...@gmail.com javascript: wrote: The imaginary `git pull-push` has no sense as `git pull` might legitimately result in a merge conflict. Note

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

2014-06-09 Thread Pierre-François CLEMENT
Hey guys, for the record here's the the thread http://thread.gmane.org/gmane.comp.version-control.git/251071 I've started on git's official mailing list. Hopefully we'll get some feedback on this. -- You received this message because you are subscribed to the Google Groups Git for human

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

2014-06-05 Thread Pierre-François CLEMENT
Le mercredi 4 juin 2014 16:28:27 UTC+2, Dale Worley a écrit : Yeah, but what one *feels* is the definition of the word is not relevant. It somehow is IMO, as I got that feeling from my day-to-day use of git and from reading its manual, so it might be the symptoma of some incoherences

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

2014-06-04 Thread Pierre-François CLEMENT
Beware, though. I don't have my Git reference to hand, but I've noted that if the file is in the index, it is tracked [...] Really? Sounds a bit strange. I feel like tracked files are committed files, and that staged files are about-to-be-tracked files so in a sort of a transient state. But

[git-users] Re: git repository versioned .config file?

2014-06-03 Thread Pierre-François CLEMENT
I want to extend git commands set on per-repository basis and therefore I need to have VERSIONED sort of .config file You can use the repository's .git/config file to set repo-specific configuration, but why would you want it to be versioned in the project itself? It'd force anybody who

Re: [git-users] Re: git repository versioned .config file?

2014-06-03 Thread Pierre-François CLEMENT
Sounds good enough. You could probably even embed it into a Makefile or a Gruntfile or whatever-file you're using if you already have one. And about the two-steps thing, you might want to get them to use a post-merge hook to automate it. -- You received this message because you are subscribed

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

2014-06-03 Thread Pierre-François CLEMENT
2014-06-03 17:03 GMT+02:00 André Hänsel an...@webkr.de: On Tuesday, June 3, 2014 2:16:44 PM UTC+2, Pierre-François CLEMENT wrote: It seems logical to me that git-reset http://git-scm.com/docs/git-reset's --hard option resets everything, what's staged, what's not, etc. I see it as a *make my

[git-users] Re: website deployment through git

2014-05-30 Thread Pierre-François CLEMENT
The easiest would be to have multiple branches and remotes on your local repo. Something like develop (developing), release (testing) and master (production) should do the trick. I've taken the branch names from Nvie's git-flow branching model

[git-users] Re: How to find out (fast) if a commit is on a _specific_ branch

2014-05-30 Thread Pierre-François CLEMENT
Starting from version 1.7.8, git-branch http://git-scm.com/docs/git-branch/1.7.8 can take a pattern argument right after the commit to filter the output branches. $ git branch --contains deadbeef master -- You received this message because you are subscribed to the Google Groups Git for

[git-users] Re: how to add a new commit to the head of a branch, so that the branches have identical content?

2014-05-20 Thread Pierre-François CLEMENT
Do you *need* a new commit on top of the DST branch? Cuz' if not, I guess you could just git-reset your DST branch to SRC's HEAD, like so: $ git checkout DST $ git reset --hard SRC It'll make SRC and DST point to the same commit. Not sure if this is what you want? Le mercredi 21 mai 2014

[git-users] Re: ignore a file without listing it in .gitignore (only locally)

2014-05-20 Thread Pierre-François CLEMENT
As you may know, the *.gitignore* file only allows *untracked* files to remain *untracked*. If you want to do this per repo, you can use the *.git/info/exclude* file, which works exactly like *.gitignore* except it's not committed and thus not shared (see the gitignore man