[git-users] Re: Copy files between local branches.

2009-09-15 Thread Konstantin Khomoutov
On Sep 15, 4:23 pm, Marcello Henrique fara...@gmail.com wrote: Is possible copy files between local branches, for example: marce...@itacellus:/var/www/moodle-git$ git branch -a UFG_18 * UFG_19 remotes/origin/HEAD - origin/UFG_18 remotes/origin/UFG_18 remotes/origin/UFG_19 I want

[git-users] Re: Add files upstream

2009-09-24 Thread Konstantin Khomoutov
On Sep 24, 9:01 am, Jeenu jee...@gmail.com wrote: I mainly use git at work for tracking my own stuff, with no intent of collaboration. I usually have huge directories to track, and when I start out, I do so with very minimal stuff which I think would suffice. Later, while I proceed through

[git-users] Re: Comment commits using accents

2009-10-19 Thread Konstantin Khomoutov
On Oct 19, 3:44 pm, Paulo Cassiano pcassi...@gmail.com wrote: I'm using Git temporarily in a Windows Vista machine and trying to comment my commits in portuguese, using accents, but my console doesn't show my comments properly... I've tried to change my console encoding from default to

[git-users] Re: Questions about git - don't read if you not want to answer newbie questions

2009-10-23 Thread Konstantin Khomoutov
On Oct 23, 12:12 am, m.m-o.net googlegoo.4.red...@a-bc.net wrote: I ll have to cooperate in a group with 3 other students and wanted to ask how to do so with git. Everyone working on his part of the project but how to put our works together? though Git is distributed - is there a easy way to

[git-users] Re: Send local branch changes to remote branch

2009-11-12 Thread Konstantin Khomoutov
On 12 ноя, 17:09, apm korja...@gmail.com wrote: The simple answer: you can't really modify origin/master locally. Jeffrey To further augment what Jeffrey said -- if you don't want the wrongly committed changes to get lost, then, while on that detached HEAD, do git tag mywork to tag the

[git-users] Re: git const branch

2009-11-27 Thread Konstantin Khomoutov
On Nov 26, 11:23 am, itroot ivan.tolstoshe...@gmail.com wrote: Some branches in git are tracking another branches (for example, usually master tracks origin/master). Let's assume, that in my work- flow i don't want accidentally commit in master, but i want master to track origin/master. I

[git-users] Re: git const branch

2009-11-27 Thread Konstantin Khomoutov
On Nov 27, 9:51 pm, Rick DeNatale rick.denat...@gmail.com wrote: Some branches in git are tracking another branches (for example, usually master tracks origin/master). Let's assume, that in my work- flow i don't want accidentally commit in master, but i want master to track origin/master. I

[git-users] Re: git const branch

2009-11-27 Thread Konstantin Khomoutov
On Nov 27, 10:25 pm, Rick DeNatale rick.denat...@gmail.com wrote: The concept for a fixed pointer to a commit is called a tag. If I want to mark a point I might want to get back to, such as the commit corresponding to a current release, the I tag it and push the tag. Good point, but there's

[git-users] Re: how to organize a repository for a shared-template system?

2009-11-30 Thread Konstantin Khomoutov
On Nov 30, 12:31 pm, Orava petri.m.wess...@gmail.com wrote: First of all, I recommend reading the relevant part of the Pro Git book [1]. [...] - All the code will live in a central remote repository or repositories. I'll check out (pull) code changes to my actual working copy repositories

[git-users] Re: Sync-ing repositories

2009-12-04 Thread Konstantin Khomoutov
On Dec 1, 2:34 pm, Roddie Grant rod...@myword.co.uk wrote: I develop a website on my laptop, in a Git repository. On the staging server (for testing) there is another repository. From time to time I push from the development repository to the server repository, and then git merge dev/master

[git-users] Re: GIT on windows ...

2009-12-14 Thread Konstantin Khomoutov
On Dec 13, 7:39 pm, Mark Rosenberg markrosenberg01460...@gmail.com wrote: There appear to be several options with respect to GIT clients, UIs, etc for use on the Windows XP platform. As someone about to start using GIT, I'd appreciate learning from this form which of the various options are

[git-users] Re: git as database

2009-12-17 Thread Konstantin Khomoutov
On Dec 17, 5:31 pm, Rick DeNatale rick.denat...@gmail.com wrote: [...] One example is a wiki. Ward Cunningham's original wiki used (probably still uses) the file system to save the wiki pages, and relied on users to manually weed out unwanted changes. Wikipedia uses a complex relational

[git-users] Re: using two git branches at the same time

2009-12-23 Thread Konstantin Khomoutov
On Dec 23, 1:01 am, Nigel Noldsworth noldswo...@googlemail.com wrote: I have a big project. I would like to evaluate another simulator against the one I'm using. Hence I would like to know whether I can create git branches * design * simulator1 * simulator2  and use two branches at the

[git-users] Re: Using Git to bisect Wine

2009-12-27 Thread Konstantin Khomoutov
On Dec 28, 2:29 am, fester225 fester...@gmail.com wrote: I'm attempting to use Git (1.6.3.3) to bisect Wine. When I ran: git bisect start, I got: fatal: invalid reference: master. How do I get rid of the error? What does `git branch` show to you? -- You received this message because you

Re: [git-users] Re: Sync with a Master

2010-01-06 Thread Konstantin Khomoutov
On Wed, Jan 06, 2010 at 06:34:37AM -0800, Trans wrote: So I've cloned a repo, which is a fork of another repo. If I want to update my repo to match the original (and ditch any changes I may have made), how do I do it? Did you follow any workflow guidelines and make your changes on separate

Re: [git-users] Re: Sync with a Master

2010-01-06 Thread Konstantin Khomoutov
On Wed, Jan 06, 2010 at 06:34:37AM -0800, Trans wrote: [...] I am using github. So I have my own fork. So it's more involved then that. I would have to delete my fork, then refork it and then reclone it. I was hoping for a simple way to update my repo without having to do all that. Correction:

[git-users] Re: User Restrictions....

2010-01-21 Thread Konstantin Khomoutov
On Jan 21, 10:23 pm, Jeffda daniel.viviot...@gmail.com wrote: Is it possible to allow commit, or patch apply, permissions for a user, but only if they aren't the ones that made the modification? For instance, if someone submits a patch to the user, the user will be able to apply the patch;

[git-users] Re: Getting a branch's time of creation

2010-03-18 Thread Konstantin Khomoutov
On Mar 17, 4:40 pm, jayman jawad.a...@gmail.com wrote: I am trying to find the time at which a remote branch was created, so that I can use the '--since' option in git log to limit the commits to only ones that were created for that branch (read below to see why I can't use 'git log

[git-users] Re: Does git have some kind of logging or verbose format?

2010-03-21 Thread Konstantin Khomoutov
On Mar 20, 9:51 pm, vfclists vfcli...@googlemail.com wrote: I keep getting Fatal: The remote end hung up unexpectedly and would like to know if there is a way to get git to give more detail on what is going run, like some verbosity level both on the server as well as locally, ls -l

[git-users] Re: set author on all commits?

2010-03-21 Thread Konstantin Khomoutov
On Mar 19, 10:00 pm, Cliff clifford.me...@gmail.com wrote: I recently imported some svn repositories into git and noticed that I have no author or committer set.  At first I thought this might be because of how I imported it it, but going back to look at the svn tree (it was just for personal

[git-users] Re: merge exactly one file ?

2010-03-22 Thread Konstantin Khomoutov
On Mar 22, 11:23 am, apm korja...@gmail.com wrote: How its possible do something like git diff second_branch -- shared_file for merge? Another words , how merge exactly one file from different branches? You can possibly feed the output of that command to `git apply` or `git am`. Note that

[git-users] Re: How to exclude branches from git push?

2010-03-31 Thread Konstantin Khomoutov
On Mar 31, 11:31 pm, vfclists vfcli...@googlemail.com wrote: When I run 'git remote show origin' the output states that a git push/ pull/fetch will fetch and push a number of branches on the remote. Is there a way to push only a particular branch and ignore the others? Yes, see the git-config

[git-users] Re: How do you exclude files from being merged by git pull, push etc?

2010-03-31 Thread Konstantin Khomoutov
On Mar 31, 6:07 pm, vfclists vfcli...@googlemail.com wrote: [...] So after creating branch, how do I configure it to exclude some files from being merged or updated from the mainline version. In other words it will be akin to having the working directory made up files from 2 or more branches

[git-users] Re: Revert To Before A Specific Patch....

2010-03-31 Thread Konstantin Khomoutov
On Apr 1, 2:51 am, Jeffda daniel.viviot...@gmail.com wrote: It would be awesome if GIT would have the capability to revert/reset to a specific date/time. Read the manual of the git-reset command (and its --hard command- line option in particular), read the manual of the git-rev-parse command

[git-users] Re: Git duplicate repo

2010-04-11 Thread Konstantin Khomoutov
On Apr 9, 10:00 pm, exa c00lzer...@gmail.com wrote: I'm a begginer with git and I'm currently using it with a repo I've created so we can work together on our project. Now I would like to use Gitorious for my project but keep my original repo and have both updated And I can't get it working,

[git-users] Re: git issue

2010-05-06 Thread Konstantin Khomoutov
On May 6, 9:43 pm, jess draco...@gmail.com wrote:     I had set up a private Git Repo server for my companies projects. For testing I did everything as root. Now that I am ready to allow others to access the Git Repositories on there I have copied the bin files from /root/bin to /usr/bin and

[git-users] Re: help - pushes not reflected on remote origin

2010-05-07 Thread Konstantin Khomoutov
On May 7, 8:34 am, Matt Palermo mpale...@vt.edu wrote: I have a server where I setup a git repo.  I cloned it on my local dev machine.  I add and delete some files and commit them on my local repo.  Then I push the commit to the server origin repo.  All the files I deleted in the local repo

[git-users] Re: help - pushes not reflected on remote origin

2010-05-07 Thread Konstantin Khomoutov
On May 7, 7:31 pm, Matt Palermo mpale...@vt.edu wrote: Okay, maybe someone can give me advice for the best way to accomplish this...  I have a team of developers (myself included) for a PHP website.  I also have a design team.  On the main webserver I want to setup the live site where all

[git-users] Re: Get tag date as the the last commit date as of tag

2010-05-26 Thread Konstantin Khomoutov
Okay this one is (perhaps) a little more challenging. The tag date is the date the tag was created. But to me the tag date needs to be the date of the last commit made upto that tag. Right now I extract the date via:   $ tag show 1.0.0 Which gives me a header:   tag 1.0.0   Tagger:

[git-users] Re: Cron and git archive

2010-06-01 Thread Konstantin Khomoutov
On Jun 1, 8:45 pm, Alexander Zaycev mailof...@gmail.com wrote: There is a script to create a backup, with the standard line: git archive --format=tar --prefix=project/ HEAD | gzip my_git.tar.gz When run manually it works fine, but cron creates a bad archive (size 20 byte). In what may be

[git-users] Re: Connecting Clones

2010-06-01 Thread Konstantin Khomoutov
On Jun 1, 9:06 am, ben bklo...@gmail.com wrote: I've created a clone (lets call it Dev) of local project (Core), and want to create a remote repo of Dev on a server (Staging) with a working tree (the actual files). How do I setup the remotes so that I can push from Dev to Staging? Is this

[git-users] Re: Pissed at Git!

2010-06-01 Thread Konstantin Khomoutov
On Jun 2, 1:45 am, Dan Preston danpres...@gmail.com wrote: [...] Yeah, agreed.  It's not always immediately obvious.  It'll say Not currently on any branch. in the git commit message boilerplate as well as git status output though, so I try to keep my eyes peeled for that not being the branch

[git-users] Re: Does git branch always branch of the latest commit?

2010-06-07 Thread Konstantin Khomoutov
On Jun 7, 12:28 pm, vfclists vfcli...@gmail.com wrote: Does git branch always branch of the latest commit? `git branch` branches from the commit you specified. Forget about Subversion. If you pass `git branch` the name of a commit object that commit object is used, if you pass a branch name the

[git-users] Re: Is it possible to push to 2 or more remote repositories at the same time?

2010-06-07 Thread Konstantin Khomoutov
On Jun 7, 12:31 pm, vfclists vfcli...@gmail.com wrote: Is it possible to push to 2 or more remote repositories at the same time? I think it's impossible. Of course, no one prevents you from writing a simple wrapper script or a shell alias which will do what you want. -- You received this

[git-users] Re: Do git tags get pushed as well?

2010-06-07 Thread Konstantin Khomoutov
On Jun 7, 1:11 pm, vfclists vfcli...@gmail.com wrote: It seems tags are not pushed automatically. I thought it would be the natural thing to do. No more natural than automatically pushing every branch you ever create locally. Git is distributed which means it does not require any remote part

[git-users] Re: re-init remote without access to the server

2010-06-09 Thread Konstantin Khomoutov
On Jun 9, 12:34 am, Dan Z danielza...@gmail.com wrote: I've got some apps on Heroku, and I need to re-init or clean out the repositories they use, but Heroku doesn't support direct access to the machine. Is there a git command I can use to re-init or completely wipe out all history in the

[git-users] Re: git on windows.. as server

2010-06-14 Thread Konstantin Khomoutov
On Jun 14, 5:54 pm, Caio cmna...@gmail.com wrote: I install git on my machine... and it works fine (i read some tutorials and search in this group ..http://groups.google.com/group/git-users/browse_frm/thread/6cf5a3573c... ) but I can't find a tutorial to share my project with another

[git-users] Re: Can't push old tag

2010-07-01 Thread Konstantin Khomoutov
On Jul 1, 8:00 pm, Trans transf...@gmail.com wrote: I tried to push my tags for the first time and an old tag is throwing an error:   $ git push --tags   To g...@github.com:proutils/vclog.git    ! [rejected]        1.4.0 - 1.4.0 (non-fast forward)   error: failed to push some refs to

[git-users] Re: git http clone error

2010-07-16 Thread Konstantin Khomoutov
Hey, guys, could you please stick to the widely-accepted and sensible rules of netiquette and at least stop over-quoting let alone top- posting (which sucks big time on its own)?! Quoting 5k of text just to post one smiley and make all the list subscribers see this is slightly over the top in my

[git-users] Re: Stash merge conflicts

2010-07-18 Thread Konstantin Khomoutov
On Jul 18, 8:19 pm, Roddie Grant rod...@myword.co.uk wrote: I discovered this afternoon a long-forgotten stash. I pop-ed it and now I have lots of merge conflicts. I'm finding it difficult to grasp the order of events. If I have: Updated upstream Code block A === Code block B

[git-users] Re: importing svn directori inside git project

2010-07-19 Thread Konstantin Khomoutov
On Jul 19, 6:06 pm, frankie frankie.gua...@gmail.com wrote: Hi. I have some svn projects I want to join in a git big project. I guess I need to tell git subtree this is a svn subtree but I just don't know how. Note that any Git repo can be cloned; local repositories residing on

[git-users] Re: Non-Git records

2010-07-19 Thread Konstantin Khomoutov
On Jul 19, 8:29 pm, Roddie Grant gitl...@myword.co.uk wrote: My recent brush with a forgotten stash has led me to consider again an issue which I've never really got a complete answer to - how much information (if any) about a project should be kept outside Git. IOW do developers keep a note

[git-users] Re: Updating a cloned repository

2010-07-30 Thread Konstantin Khomoutov
On Jul 30, 5:36 pm, DAZ daz4...@gmail.com wrote: I have only used git for basic stuff, so I hope this makes sense Say I create a very small CSS framework and put it in a git repository. If I want to use the framework in a new website, then I think the best way is to clone the git

[git-users] Re: git push to different branches

2010-07-30 Thread Konstantin Khomoutov
On Jul 28, 10:00 pm, joe ehass...@gmail.com wrote: When going through several articles/tutorials about git I see the following being done for the initial push to a new branch: git push origin branchname:refs/heads/branchname Is this necessary for subsequent pushes or does git push do the

[git-users] Re: Developing Wordpress plugins

2010-08-13 Thread Konstantin Khomoutov
On Aug 11, 5:30 am, Daniel Trezub daniel...@gmail.com wrote: I've just started using git last week, and I am still learning a lot. This means I am still messing with my trees a lot, too :) I am trying to mantain a Wordpress website. So I want to use git to keep my wordpress installation

[git-users] Re: How to move the master?

2010-08-13 Thread Konstantin Khomoutov
On Aug 13, 10:44 pm, David Bruce davidstuartbr...@gmail.com wrote: Along these lines, we are in a somewhat similar situation.  Basically, we have had a major feature branch for a GSoC project, and this branch has now substantially diverged from master.  However, the divergence is almost

[git-users] Re: Merging workflow

2010-08-13 Thread Konstantin Khomoutov
On Aug 13, 7:37 pm, David Doria daviddo...@gmail.com wrote: Ah, so fetch is an operation on the entire repository and merge is an operation on a specific branch? So you're say that 'pull'ing each branch is not necessary because the 'fetch' in 'pull's fetch+merge is redundant. Is that correct?

[git-users] Re: Pushing to master from Experimental

2010-08-21 Thread Konstantin Khomoutov
On Aug 21, 5:04 pm, David Doria daviddo...@gmail.com wrote: [...] However, if I git clone 'repo' git branch Experimental git checkout Experimental do some work git push origin master I get error: failed to push some refs to 'repo' Then if I do git pull --rebase git push origin

[git-users] Re: Pushing to master from Experimental

2010-08-21 Thread Konstantin Khomoutov
On Aug 21, 6:03 pm, David Doria daviddo...@gmail.com wrote: Ah yes, always so clear... haha So I need to do git push origin Experimental:master Yes. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to

[git-users] Re: getting a list of branches

2010-08-24 Thread Konstantin Khomoutov
On Aug 24, 10:24 pm, Ted cecinemapasdera...@gmail.com wrote: Is there some way to specifically get a list of branches, without the annotation that `git branch` normally adds?  I'd like to write a script that loops over branches, but it shouldn't be dependent on the presentation format. It

[git-users] Re: What to do when you get a conflict (rails) of schema.rb

2010-08-25 Thread Konstantin Khomoutov
On Aug 26, 1:51 am, Pito Salas r...@salas.com wrote: This happens from time to time and I am not sure the right solution: Working on a rails application, I am merging my branch (where I did some migrations) with your branch (where you did some migrations too). Inevitably there's a conflict

[git-users] Re: What to do when you get a conflict (rails) of schema.rb

2010-08-26 Thread Konstantin Khomoutov
On Aug 26, 6:20 pm, Pito Salas r...@salas.com wrote: Hmm. But it's a git-users question. Thanks anyway. [...] My understanding is that the -users suffix is used to differentiate this list from the Git list for developers (hosted at vger.kernel.org) which for some reason is named just git and

[git-users] Re: Git reset / revert not working

2010-08-29 Thread Konstantin Khomoutov
On Aug 29, 7:38 pm, Flak37 kamathan...@gmail.com wrote: I downloaded a bundle which I cloned from. Unfortunately the person who made the bundle had made some unstaged changes I tried to pull, but it gave me an error about the changes So i used git reset --hard and I tried to pull again and

[git-users] Re: Why we got so heavily involved in the Subversion project..

2010-09-12 Thread Konstantin Khomoutov
On Sep 12, 9:38 pm, Elaine elnemur...@gmail.com wrote: http://blogs.wandisco.com/author/david/ The problem we saw was that the Gitterons were firing (cheap) shots at Subversion. Tweets like “Subversion is so [slow/crappy/restrictive/ doesn't smell good/looks at me in a funny way] and now I

[git-users] Re: Misnamed remote branch

2010-09-15 Thread Konstantin Khomoutov
On Sep 15, 5:41 pm, Roddie Grant gitl...@myword.co.uk wrote: With a moment's inattention I typed git push test databaseTests:refs/remotes/dev/databaseTsts instead of git push test databaseTests:refs/remotes/dev/databaseTests and now in the test repos the listing from git br -a includes

[git-users] Re: change another branch

2010-09-16 Thread Konstantin Khomoutov
On Sep 16, 3:11 pm, Michael P. Soulier msoul...@digitaltorque.ca wrote: I forgot to mention the work branch is based on master. It is one or more commits ahead. I only  want to move the master head to the work head. That's what merge is for. Why would you use reset? Also I should note that

[git-users] Re: Misnamed remote branch

2010-09-16 Thread Konstantin Khomoutov
On Sep 15, 5:41 pm, Roddie Grant gitl...@myword.co.uk wrote: I noticed several spelling errors in my post. Namely, empty refspect should be read as empty refspec as refspec is derived from reference specification, and instead of you don't really understand there should have been *I* don't really

[git-users] Re: Pushing only a single file

2010-10-01 Thread Konstantin Khomoutov
On Oct 1, 5:57 pm, David Doria daviddo...@gmail.com wrote: I cloned a repository, created an Experimental branch, then worked on two files: 1) edit a.h 2) edit b.h 3) git add . 4) git commit -m worked on a and b Now I have decided that a.h is ready to push into the main repository, but

[git-users] Re: Corrupted repository ?

2010-10-05 Thread Konstantin Khomoutov
On Oct 5, 9:28 pm, Simon slo...@gmail.com wrote: I’m trying to put one of my repositories to another machine. I do that : git clone --bare test test.git scp -r test.git u...@host:~ mv test test.old git clone ssh://u...@host/~/test.git [...] I'm not sure why later cloning the new

[git-users] Re: Corrupted repository ?

2010-10-06 Thread Konstantin Khomoutov
On Oct 6, 1:11 pm, Simon Lipp slo...@gmail.com wrote: I'm not sure why later cloning the new repository fails, but I would suggest using more sensible approach to putting the repository to another machine in the first place: [...] $ git push --mirror foo Doesn’t change anything : on my

[git-users] Re: git pull error

2010-10-07 Thread Konstantin Khomoutov
On Oct 7, 11:05 am, Chandu80 chandu.she...@gmail.com wrote: I fetched a remote repository(git fetch) and pulled(git pull) the contents from it successfully. Now I change a file in the working directory,stage it(git add) and commit(git commit) it  and then  push(git push) it back to the remote

[git-users] Re: Corrupted repository ?

2010-10-07 Thread Konstantin Khomoutov
On Oct 7, 10:43 am, Simon Lipp slo...@gmail.com wrote: Very interesting. What happens if you clone on the same host? $ cd /tmp/foo $ git clone /path/to/test or $ git clone file:///path/to/test ? If it fails, try looking at `git fsck`. On the local side, git clone works and git

[git-users] Re: diff-ing branches

2010-10-12 Thread Konstantin Khomoutov
On Oct 12, 9:17 pm, David Doria daviddo...@gmail.com wrote: Here is my setup: MasterRepo: branch 'master' - this is the live copy SecondRepo: branch 'mybranch' - cloned from MasterRepo's master branch a long time ago. Changes have been made. What I want to do is see which files are

[git-users] Re: Need Help - CONFLICT (add/add)

2010-10-13 Thread Konstantin Khomoutov
On Oct 13, 8:44 pm, Ken kohud...@gmail.com wrote: Thank you very much for your help Konstantin!!  I submitted the first command: git checkout --theirs public/images/NewMexico_jul_1.jpg And received the following error: error: pathspec 'public/images/NewMexico_jul_1.jpg' did not match any

[git-users] Re: Push Problems

2010-10-22 Thread Konstantin Khomoutov
On Oct 22, 9:23 pm, Ravi D r...@haasiniventures.com wrote: I followed the instructions on git book and set up a private git repository. The idea is that all the developers in our company should be able to push to this git repo. However, it seems that i am getting permission errors. Short of

[git-users] Re: Are private blobs/trees possible?

2010-10-25 Thread Konstantin Khomoutov
On Oct 25, 11:24 pm, kj kyn...@gmail.com wrote: There are some files that I want to keep under local git control, but never push to any remote repositories. What's the best way to implement this idea with git? The best solution I can think of is to put these files in some git-controlled

[git-users] Re: Git Merge Conflict

2010-10-26 Thread Konstantin Khomoutov
On Oct 26, 11:26 am, Chandu80 chandu.she...@gmail.com wrote: I have two files rpc-devexprcpseq-nav.rb and readme.txt. My workflow is as follows. [...] Auto-merging lib/rpc-devexprcpseq-nav.rb CONFLICT (content): Merge conflict in lib/rpc-devexprcpseq-nav.rb Auto-merging readme.txt CONFLICT

[git-users] Re: Git push error

2010-10-27 Thread Konstantin Khomoutov
On Oct 27, 11:22 am, Prashant Shirbhate prashantshirbh...@gmail.com wrote: While pusing my filed to  my your public repository i got below error. Please suggest for the same C:\private\prashantgit push To c:\lmg_test\public_prashant.git  ! [rejected]        master - master

[git-users] Re: svn repository URL and git

2010-10-27 Thread Konstantin Khomoutov
On Oct 27, 5:06 pm, hetchkay hetch...@gmail.com wrote: We have started using git and git-svn. I was thrilled to see that two people cloning using git svn clone from the same repository got the same sha1 IDs for the commits which meant that each of us could sync with svn independently while

[git-users] Re: Command not found

2010-11-04 Thread Konstantin Khomoutov
On Nov 5, 12:10 am, Gareth gareth.b.fos...@gmail.com wrote: I've installed git using 'apt-get install git' - and ran fine. However - it doesnt seem to work. If I do a whereis git it returns nothing. And if I do a dpkg -s git I get this: Package: git Status: install ok installed Priority:

[git-users] Re: applying and un-applying the same commit

2010-11-13 Thread Konstantin Khomoutov
On Nov 12, 10:59 pm, ruud r.grosm...@gmail.com wrote: [...] I work on several project on two sites: the site the software wil run on eventually and on my laptop. The two sites differ: the operating system is different, the installed software is a bit different and the file system has another

[git-users] Re: Looking up SHA1s

2010-11-16 Thread Konstantin Khomoutov
Martin Fick wrote: This might be a silly question, but I can't figure it out: is there a way to get all the tags and branches whose tip includes a certain blob (by SHA1) in its tree object? I doubt there is any ready-made solution for this corner case, but you could roll your own using

[git-users] Re: Looking up SHA1s

2010-11-16 Thread Konstantin Khomoutov
On Nov 17, 4:12 am, Martin Fick mf...@codeaurora.org wrote: This might be a silly question, but I can't figure it out: is there a way to get all the tags and branches whose tip includes a certain blob (by SHA1) in its tree object? I doubt there is any ready-made solution for this

[git-users] Re: How do you download only the necessary part of a repository?

2010-11-16 Thread Konstantin Khomoutov
On Nov 16, 2:20 am, vfclists vfcli...@gmail.com wrote: If you want to work with only a few of the branches of a remote repository, how to you clone it in a way which does not bring down everything? I think it's impossible. But you should maybe rethink your approach to this. First, what you

[git-users] Re: Forcing a non-fastforward push

2010-12-06 Thread Konstantin Khomoutov
On Dec 5, 11:43 pm, Roddie Grant gitl...@myword.co.uk wrote: [...] Oops, the sequence $ git checkout nowork $ git reset --hard dev/mybranch will make the nowork branch be the same as dev/mybranch branch, of course. -- You received this message because you are subscribed to the Google Groups

[git-users] Re: Merge log about same user.

2010-12-10 Thread Konstantin Khomoutov
Marcello Henrique wrote: I have a git repository, I commited by diferent accounts just that same people. How merge historic into logs? I can't quite parse this. Do you mean you have a line (or lines) of commits made by different committers which are, in fact, the same person, and now you want

Re: [git-users] git-svn setup advice for newbie

2011-01-02 Thread Konstantin Khomoutov
On Sun, Jan 02, 2011 at 11:39:36PM +, graham wrote: [...] Hence, the course of action for you would probably be: 1) Prepare the authors file. 2) git-svn clone the Subversion repo. 3) Fork its master branch to your two local branches. Is there a best way to do the fork? For longstanding

Re: [git-users] libgit2 usage in git project

2011-01-11 Thread Konstantin Khomoutov
On Tue, Jan 11, 2011 at 02:43:35AM -0800, itroot wrote: Is there any plan to use libgit2 inside git ? Looks like [1] might answer your question (in the short term). 1. http://lwn.net/Articles/420373/ -- You received this message because you are subscribed to the Google Groups Git for human

Re: [git-users] Cherry-pick behaving strangely?

2011-01-23 Thread Konstantin Khomoutov
On Sun, Jan 23, 2011 at 08:10:00PM -0800, Zach Bailey wrote: I am leading a subversion to git migration where I work and things are going OK so far. One weird thing we are noticing is when we're cherry- picking old commits from the an old subversion integration branch into several separate

Re: [git-users] fatal: No existing author found with

2011-01-24 Thread Konstantin Khomoutov
On Mon, Jan 24, 2011 at 04:38:05PM -0800, ats wrote: I did not have the global user.name and user.email not set and hit the commit first. I am now trying to amend the username with the below command now git commit --amend --author=ats@X I have tried above with both the old use.email

Re: [git-users] Splitting Git Repository

2011-01-31 Thread Konstantin Khomoutov
On Sun, 30 Jan 2011 17:19:28 -0800 (PST) harlan har...@bloomenterprises.org wrote: I'm trying to split out a directory, and subdirectories, into a separate repository. I can split (copy) my local repository, but so far haven't been able to make anything save to it correctly. Looks like it's a

Re: [git-users] Pushing a specific commit

2011-01-31 Thread Konstantin Khomoutov
On Mon, 31 Jan 2011 18:07:07 + Roddie Grant gitl...@myword.co.uk wrote: I have a repository with commits A B C D E and a remote repository with commits A B C previously pushed and merged. Now I want to push D to the remote, but not E. I can see various possible ways this might work,

Re: [git-users] Pushing a specific commit

2011-02-01 Thread Konstantin Khomoutov
On Mon, 31 Jan 2011 21:25:31 +0100 Karel Vervaeke ka...@vervaeke.info wrote: (Formatting sanitized.) I have a repository with commits A B C D E and a remote repository with commits A B C previously pushed and merged. Now I want to push D to the remote, but not E. I can see

Re: [git-users] Recursively export files for n commits?

2011-02-07 Thread Konstantin Khomoutov
On Mon, Feb 07, 2011 at 06:20:49PM -0800, Mark (my words) wrote: Being new to git, and cvs in general, I lack the vocabulary to describe what I want to do. Here’s my best shot at articulating it: I have, let's say 10, versions of a file in a git repository that I would like to save out as

Re: [git-users] unknown revisions of software

2011-02-10 Thread Konstantin Khomoutov
On Thu, Feb 10, 2011 at 02:20:15PM -0800, Jason Brooks wrote: I am not sure what I am asking, so I thought I would start here. If I knew the name of this operation, I would look for it. :) I have a software deployment that was copied out of a git repository but without the .git

Re: [git-users] Re: diffs within the whole content of a file

2011-02-11 Thread Konstantin Khomoutov
On Fri, 11 Feb 2011 08:49:47 -0800 (PST) Andrej Khitrov a.n.khit...@gmail.com wrote: May be you meant $ git show HEAD:your_file /tmp/your-file-as-in-HEAD $ git show HEAD^:your_file /tmp/your-file-as-in-HEADs-parent ? No. But OK, I have realized that my problem concerns rather diff

Re: [git-users] Need help using Gitosis

2011-02-11 Thread Konstantin Khomoutov
On Fri, 11 Feb 2011 10:27:09 -0800 (PST) hujiko artife...@gmx.de wrote: i have set up a git server on ubuntu, and everthing works fine :) Now i want to use the current sourcecode to be linked in my apache www directory. So when i push to the server, i want a symlink in my apache-dir linking

Re: [git-users] Breaking branches out into their own repo - Am I crazy?

2011-02-14 Thread Konstantin Khomoutov
On Mon, 14 Feb 2011 08:34:05 -0800 (PST) Veloz michaelve...@gmail.com wrote: [...] I did a little testing whereby a setup a bare repo on my machine and added an origin to my source repo to point to this bare repo. Then I checked out some branch on my source repo, say desiredbranch tried to do

Re: [git-users] Conflicts from stash

2011-02-22 Thread Konstantin Khomoutov
On Mon, Feb 21, 2011 at 09:18:41PM +, Roddie Grant wrote: git stash list produces stash@{0}: On bucketDisplay: site/css/site.css from which I infer that the only file in the stash is site/css/site.css. But git stash pop lists merge conflicts with 5 other files. What's going on? git-stash

Re: [git-users] How to see branch history?

2011-03-05 Thread Konstantin Khomoutov
On Fri, Mar 04, 2011 at 11:47:22PM -0800, Dmitry wrote: A branch is git a reference to a single commit. So the question is: how can I see what commits it pointed to before? Although we can see all ancestors of any commit we need some way to tell past head revisions apart from any developer

Re: [git-users] How to see branch history?

2011-03-05 Thread Konstantin Khomoutov
On Sat, 5 Mar 2011 11:12:42 +0300 Дмитрий Волочаев mrblack.pp...@gmail.com wrote: ISTR, t's possible to force this via the git config mechanism. Thank you. I see. And then we should distinguish mainline commits by the committer name of some special string in Commit Message, right? gitk does

Re: [git-users] git revert deleted my files - how to restore

2011-03-16 Thread Konstantin Khomoutov
On Wed, Mar 16, 2011 at 11:33:37AM -0700, pbg wrote: Im a beginner to git . I did a git add directory . It added all the files in the directory some of them are .o and generated files so i did not want to commit . so i did a git revert . After that i see that git revert removed all my

[git-users] Re: git gui equivalent to git checkout -b

2011-03-30 Thread Konstantin Khomoutov
On Mar 29, 10:00 pm, Matt Seitz (matseitz) matse...@cisco.com wrote: What is the git gui equivalent to git checkout -b? I have a working tree with changes that I don't want to commit to master yet.  So I want to create a new branch to contain my changes. If I go to Branch-Checkout, I don't

Re: [git-users] Re: git gui equivalent to git checkout -b

2011-03-30 Thread Konstantin Khomoutov
On Wed, 30 Mar 2011 10:14:05 -0700 (PDT) matseitz_cisco matse...@cisco.com wrote: What is the git gui equivalent to git checkout -b? I have a working tree with changes that I don't want to commit to master yet.  So I want to create a new branch to contain my changes. If I go

Re: [git-users] Re: git warning: remote HEAD

2011-03-31 Thread Konstantin Khomoutov
On Thu, 31 Mar 2011 09:01:13 -0700 (PDT) romerve rome...@gmail.com wrote: I am new to Git and been using SVN for a little while. I have set up Git and i am trying to clone a project via http and i am getting: It seems you failed to paste what you're getting. I also setup gitweb

Re: [git-users] git checkout in a subdirectory

2011-04-04 Thread Konstantin Khomoutov
On Mon, 4 Apr 2011 02:20:42 -0700 (PDT) alenoosh hope2...@gmail.com wrote: I have recently converted my svn repository to git repository (A) but I did not convert the svn branches , here is my problem : One of my svn branches is a branch of a subdirectory , I have converted that to a

Re: [git-users] git read-tree failure

2011-04-05 Thread Konstantin Khomoutov
On Tue, 5 Apr 2011 06:09:26 -0700 (PDT) Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I'm not really familiar with the read-tree command, nor have I had any use for it the last year of using git :) I think read-tree is more of a lower level plumbing command that normally we do not have

Re: [git-users] Help with git clone

2011-04-11 Thread Konstantin Khomoutov
On Mon, 11 Apr 2011 13:43:25 +0100 Antony Male antony.m...@gmail.com wrote: [...] When you clone (or fetch) a repository over the git protocol, a program on your computer (git-fetch-pack) and a similar one on the server (git-upload-pack) coordinate to figure out exactly what commits (roughly

Re: [git-users] Help with git clone

2011-04-12 Thread Konstantin Khomoutov
On Tue, Apr 12, 2011 at 10:56:44AM +0530, Mohith Thimmaiah wrote: On Mon, 11 Apr 2011 13:43:25 +0100 Antony Male antony.m...@gmail.com wrote: [...] When you clone (or fetch) a repository over the git protocol, a program on your computer (git-fetch-pack) and a similar one on the

Re: [git-users] confused about tortoise git and unix git

2011-04-20 Thread Konstantin Khomoutov
On Wed, 20 Apr 2011 09:16:39 -0700 (PDT) Angelo angelo.more...@gmail.com wrote: [...] Now my setup is: (GIT remote repository server - centos) - (Dev server - centos) - (windows machine through samba) 1 - (windows machine through samba) 2 The windows machines that access to the dev

  1   2   3   4   5   6   7   8   9   10   >