[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 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 in the remote reposi

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

2010-03-31 Thread Konstantin Khomoutov
On Apr 1, 2:51 am, Jeffda 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 and its "SPECIFYING REVIS

[git-users] Re: Git Error: "points nowhere"

2010-04-05 Thread Konstantin Khomoutov
On Mar 31, 2:29 am, Gina Glaser wrote: > Whenever I try to run any Git commands, I get the error: > error: refs/remotes/m/f2d704c379fecb5597d0aaab007ee04fc9a83842 points > nowhere! > > f2d704c379fecb5597d0aaab007ee04fc9a83842 is the commit ID of a Git > tree that I tried to clone previously. It se

[git-users] Re: Git duplicate repo

2010-04-11 Thread Konstantin Khomoutov
On Apr 9, 10:00 pm, exa 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, could someone e

[git-users] Re: Passphrase save issue

2010-04-19 Thread Konstantin Khomoutov
On Apr 19, 11:20 am, badnaam wrote: > I have followed the direction > athttp://help.github.com/working-with-key-passphrases/ > and modified my .bashrc to launch ssh-agent. The keys use standard > names but i keep getting prompted for the passphrase everytime I do a > pull or push. What am I miss

[git-users] Re: git issue

2010-05-06 Thread Konstantin Khomoutov
On May 6, 9:43 pm, jess 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 created a new r

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

2010-05-07 Thread Konstantin Khomoutov
On May 7, 8:34 am, Matt Palermo 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 still appear

[git-users] Re: 'v' prefix on version tags

2010-05-07 Thread Konstantin Khomoutov
On May 7, 12:51 am, Trans wrote: > I notice that almost every tagging example uses a version number with > a prefixed 'v', e.g. > >   $ tag -a -m "first major point release" v1.0.0 > > I, on the other hand, have never bothered with 'v' prefix, and have > always done, e.g.: > >   $ tag -a -m "firs

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

2010-05-07 Thread Konstantin Khomoutov
On May 7, 7:31 pm, "Matt Palermo" 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 tested code

[git-users] Re: Question about git pull --rebase

2010-05-13 Thread Konstantin Khomoutov
On May 13, 8:14 pm, Rick DeNatale wrote: > I've accepted the warning that you shouldn't rebase a branch unless it > has never been pushed to a shared repository since it can wreak havoc > on others who have pulled the branch. > > Yehuda Katz just wrote about his git > workflowhttp://yehudakatz.c

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

[git-users] Re: git pull

2010-05-28 Thread Konstantin Khomoutov
On May 28, 11:40 am, Sapna wrote: > I am trying to do 'git pull' to an existing workspace. I did the > following initially (init/sync/checkout). Now every 1 minute, I want > to pull the content from the remote repo, and compare the commit IDs > with the previous list of commit IDs. If the commit

[git-users] Re: Pissed at Git!

2010-06-01 Thread Konstantin Khomoutov
On Jun 2, 1:07 am, Trans wrote: > Sorry, make that: >   $ git branch recentwork 8658a39 Yes. Or `git tag recentwork 8658a39`. Or `git checkout master && git merge 8658a39`. In this sense, tag and branch names are just alternative means to refer to these "true" names of commit objects which are

[git-users] Re: Cron and git archive

2010-06-01 Thread Konstantin Khomoutov
On Jun 1, 8:45 pm, Alexander Zaycev 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 the proble

[git-users] Re: Connecting Clones

2010-06-01 Thread Konstantin Khomoutov
On Jun 1, 9:06 am, ben 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 the wrong w

[git-users] Re: Pissed at Git!

2010-06-01 Thread Konstantin Khomoutov
On Jun 2, 1:45 am, Dan Preston 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 I think I'm on

[git-users] Re: Pissed at Git!

2010-06-01 Thread Konstantin Khomoutov
On Jun 2, 1:56 am, Dan Preston wrote: > > Yes. > > Or `git tag recentwork 8658a39`. > > Or `git checkout master && git merge 8658a39`. > > Everything Konstantin said is correct, but I just wanted to add that > git tag will not get you out of the "detached HEAD" state, so you'll > probably want to

[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 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 tip commit of that

[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 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 message because you a

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

2010-06-07 Thread Konstantin Khomoutov
On Jun 7, 1:11 pm, vfclists 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 at all. Anythin

[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 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 remote repository? You

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

2010-06-09 Thread Konstantin Khomoutov
On Jun 9, 5:53 pm, Dan Z wrote: > Thanks for the reply. However, this doesn't work. If I try to push > nothing, I get this error: > > -> Heroku receiving push >  !     Heroku push rejected due to an unrecognized error. Please try > again later. > > error: hooks/pre-receive exited with error c

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

2010-06-10 Thread Konstantin Khomoutov
On Jun 10, 2:13 am, Daniel Zajic wrote: > Actually, I did do a "-f" push. If I don't, it complains in the usual way > that it's not a fast-forward. > > Thanks for the explanation about branch behavior, but it must not be > impossible because it happened to me. I was able to push a branch from a

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

2010-06-14 Thread Konstantin Khomoutov
On Jun 14, 5:54 pm, Caio 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 > programmer (usin

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

2010-06-19 Thread Konstantin Khomoutov
On Jun 14, 5:54 pm, Caio 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 > programmer (usin

[git-users] Re: Can I tell git to ignore changes in certain files on merge?

2010-06-20 Thread Konstantin Khomoutov
On Jun 20, 7:50 am, David Bruce wrote: > My program uses gettext, so the *.po files get modified whenever a > "make dist" is run.  Usually this just updates the "POT-Creation-Date" > timestamp line.  As a result, whenever I try to merge two branches, > all the *.po files inevitably conflict.  I t

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

2010-07-01 Thread Konstantin Khomoutov
On Jul 1, 8:00 pm, Trans 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 '@github.com:

[git-users] Re: Git Ignore

2010-07-05 Thread Konstantin Khomoutov
On Jul 4, 6:50 pm, KaibutsuX wrote: > I'm committing some selenium tests for departmental use and the first > file is a login script which has two fields for user and password. I'm > committing them with some default junk values, but I would like to > have everyone pull the script and the followin

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

2010-07-12 Thread Konstantin Khomoutov
On Jul 12, 12:10 pm, frankie wrote: > Hi. I have some svn projects I want to join in a git big project. > > I've been trying with guidelines from the git faq and from >  http://www.jonmaddox.com/2008/03/05/cleanly-migrate-your-subversion-r... > but I'm not able to do it. > > So I have a new git p

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

2010-07-15 Thread Konstantin Khomoutov
> > > Hi. I have some svn projects I want to join in a git big project. > > Assuming you want to do the latter, I think git-subtree [1] can be of > > help: as I understand, it allows you to "inject" a subtree to a bigger > > project. > > Hi. I am unable to import a svn tree inside git using subtree

[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 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 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 > > your local fi

[git-users] Re: Non-Git records

2010-07-19 Thread Konstantin Khomoutov
On Jul 19, 8:29 pm, Roddie Grant 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 (on paper, sprea

[git-users] Re: Needs merge

2010-07-22 Thread Konstantin Khomoutov
On Jul 22, 8:38 pm, Roddie Grant wrote: > On branch combo, I've trying to merge thus: > $ git merge dev/cola_moss > > But I get > CONFLICT (content): Merge conflict in site/configs/site.cnfg > > I resolve the conflict, but then when I try "git ci" I get > site/configs/site.cnfg: needs merge > sit

[git-users] Re: Git rebase --interactive like command, but edit diffs/patches instead of individual files

2010-07-27 Thread Konstantin Khomoutov
On Jul 27, 4:48 pm, misha680 wrote: > > > I have heard great things about this > > > list:http://kerneltrap.org/mailarchive/git/2008/6/4/2025514 > > > > I love git rebase --interactive, but would like to have the same > > > functionality for editing the actual diffs themselves (e.g., two > > > co

[git-users] Re: Git rebase --interactive like command, but edit diffs/patches instead of individual files

2010-07-27 Thread Konstantin Khomoutov
On Jul 27, 10:40 pm, misha680 wrote: > On Jul 27, 9:11 am, Konstantin Khomoutov wrote: > > > > > I have heard great things about this > > > > > list:http://kerneltrap.org/mailarchive/git/2008/6/4/2025514 > > > > > > I love git re

[git-users] Re: Updating a cloned repository

2010-07-30 Thread Konstantin Khomoutov
On Jul 30, 5:36 pm, DAZ 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 repository, so t

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

2010-07-30 Thread Konstantin Khomoutov
On Jul 28, 10:00 pm, joe 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 same > thing?

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

2010-08-12 Thread Konstantin Khomoutov
On Aug 12, 5:32 am, jd wrote: > I needed to go back in time (a few weeks) for just one subtree of my > git repository (in order to get rid of some recent changes that were > no longer wanted).  I did the following: > >    git checkout > > At first glance, this seemed to do the right thing: the f

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

2010-08-13 Thread Konstantin Khomoutov
On Aug 12, 9:09 pm, jd wrote: > > That's because you created a situation known as "detached HEAD". > > > > How can I fix this?  I want "master" to point to the same place as HEAD. > > Record the name of the commit HEAD points at, checkout master and > > "hard reset" it to that commit. The simplest

[git-users] Re: Merging workflow

2010-08-13 Thread Konstantin Khomoutov
On Aug 13, 5:12 am, David Doria wrote: [...] > Then when I update something in Project1, I just do a > > |[dor...@localhost AllProjects]$ git pull origin Project1 > > and AllProjects is now up to date. It's not clear why you need to pull each branch. Note that pull does fetch + merge, so each pul

[git-users] Re: Developing Wordpress plugins

2010-08-13 Thread Konstantin Khomoutov
On Aug 11, 5:30 am, Daniel Trezub 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 up-to-date, as desc

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

2010-08-13 Thread Konstantin Khomoutov
On Aug 13, 10:44 pm, David Bruce 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 completely due to equivalent

[git-users] Re: Merging workflow

2010-08-13 Thread Konstantin Khomoutov
On Aug 13, 7:37 pm, David Doria 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? It's a bit more

[git-users] Re: Word wrap in Terminal

2010-08-16 Thread Konstantin Khomoutov
On Aug 17, 12:13 am, Roddie Grant wrote: > This is one of those things that should be obvious, but I'm blowed if I can > find it. > > When I use git log in Terminal on my Mac there is no word wrap, so I only > get partial commit messages thus (deliberately exaggerated because of email > word wrap!

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

2010-08-21 Thread Konstantin Khomoutov
On Aug 21, 5:04 pm, David Doria 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 master >

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

2010-08-21 Thread Konstantin Khomoutov
On Aug 21, 6:03 pm, David Doria 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-us...@google

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

2010-08-24 Thread Konstantin Khomoutov
On Aug 24, 10:24 pm, Ted 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 appears that you could parse

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

[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 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 not "git-dev

[git-users] Re: Clone Shows Old Moved Files

2010-08-29 Thread Konstantin Khomoutov
On Aug 30, 1:54 am, gsl1 wrote: > I created a local git repository and committed a directory of files to > it successfully. I then altered one of the files and committed it > again. Then I did a git mv on the same file to a new file. All worked > as expected. Next I made a new local repository of

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

2010-08-29 Thread Konstantin Khomoutov
On Aug 29, 7:38 pm, Flak37 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 got the exact > sa

[git-users] Re: Clone Shows Old Moved Files

2010-08-31 Thread Konstantin Khomoutov
On Aug 30, 2:16 pm, Gregg Leichtman wrote: >  From my CVS experience, I would expect the behavior that I have seen. I > just forgot to do the commit and it didn't click that I missed the > commit until I was told that it does work as I originally expected it > should. [...] >> in fact git-mv (lik

[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 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 have GIT and > [

[git-users] Re: Misnamed remote branch

2010-09-15 Thread Konstantin Khomoutov
On Sep 15, 5:41 pm, Roddie Grant 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 > remotes/dev/databas

[git-users] Re: change another branch

2010-09-16 Thread Konstantin Khomoutov
On Sep 16, 3:11 pm, "Michael P. Soulier" 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 is smart about

[git-users] Re: Misnamed remote branch

2010-09-16 Thread Konstantin Khomoutov
On Sep 15, 5:41 pm, Roddie Grant 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 understand

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

2010-10-01 Thread Konstantin Khomoutov
On Oct 1, 5:57 pm, David Doria 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 b.h is no

[git-users] Re: Corrupted repository ?

2010-10-05 Thread Konstantin Khomoutov
On Oct 5, 9:28 pm, Simon 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 repository fails, b

[git-users] Re: Corrupted repository ?

2010-10-06 Thread Konstantin Khomoutov
On Oct 6, 1:11 pm, Simon Lipp 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 local mac

[git-users] Re: git pull error

2010-10-07 Thread Konstantin Khomoutov
On Oct 7, 11:05 am, Chandu80 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 > repository,it giv

[git-users] Re: Corrupted repository ?

2010-10-07 Thread Konstantin Khomoutov
On Oct 7, 10:43 am, Simon Lipp 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 g

[git-users] Re: creating/submitting a patch series

2010-10-08 Thread Konstantin Khomoutov
On Oct 8, 9:30 pm, David A wrote: > Can someone suggest a method for how to creating a series of patches > for submission to a project? > > For example, I want to add feature A and a new command B to use > feature A. So a patch series might be: > > 1. add base code for feature A > 2. modify exist

[git-users] Re: diff-ing branches

2010-10-12 Thread Konstantin Khomoutov
On Oct 12, 9:17 pm, David Doria 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 different in Seco

[git-users] Re: diff-ing branches

2010-10-12 Thread Konstantin Khomoutov
On Oct 12, 11:01 pm, David Doria wrote: > Good idea. I tried to do that, but the diff command fails: > > [dor...@doriadjec VTK-PCA]$ git remote add kitware git://vtk.org/VTK.git > [dor...@doriadjec VTK-PCA]$ git fetch kitware master > remote: Counting objects: 6937, done. > ... >  * branch      

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

2010-10-13 Thread Konstantin Khomoutov
On Oct 13, 8:10 pm, Ken wrote: > I need some help.  I have two branches: "master" and "add_articles". > I've been doing my work in add_articles and I wanted to merge the > changes in to master prior to doing a deploy of my application. > Here's the sequence of events: > > git branch - showed the

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

2010-10-13 Thread Konstantin Khomoutov
On Oct 13, 8:10 pm, Ken wrote: > I need some help.  I have two branches: "master" and "add_articles". > I've been doing my work in add_articles and I wanted to merge the > changes in to master prior to doing a deploy of my application. > Here's the sequence of events: > git merge add_articles - g

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

2010-10-13 Thread Konstantin Khomoutov
On Oct 13, 8:44 pm, Ken 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 > file(s) kn

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

2010-10-13 Thread Konstantin Khomoutov
On Oct 13, 9:05 pm, Ken wrote: > Well, not "the same" but that my changes have been merged... Depends on what you will consider as being merged, really. This is because you're free to stuff the conflicting file using any contents you want and then commit this. So you can verify the state just by

[git-users] Re: Push Problems

2010-10-22 Thread Konstantin Khomoutov
On Oct 22, 9:23 pm, Ravi D 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 making the repository

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

2010-10-25 Thread Konstantin Khomoutov
On Oct 25, 11:24 pm, kj 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 directory t

[git-users] Re: Git Merge Conflict

2010-10-26 Thread Konstantin Khomoutov
On Oct 26, 11:26 am, Chandu80 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 (content): Merge c

[git-users] Re: Git push error

2010-10-27 Thread Konstantin Khomoutov
On Oct 27, 11:22 am, Prashant Shirbhate wrote: > While pusing my filed to  my your public repository i got below error. > > Please suggest for the same > > C:\private\prashant>git push > To c:\lmg_test\public_prashant.git >  ! [rejected]        master -> master (non-fast-forward) > error: failed t

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

2010-10-27 Thread Konstantin Khomoutov
On Oct 27, 5:06 pm, hetchkay 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 still > being

[git-users] Re: Command not found

2010-11-04 Thread Konstantin Khomoutov
On Nov 5, 12:10 am, Gareth 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: optional > Section

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

2010-11-13 Thread Konstantin Khomoutov
On Nov 12, 10:59 pm, ruud 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 structure. > When

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

[git-users] Re: Looking up SHA1s

2010-11-16 Thread Konstantin Khomoutov
On Nov 17, 4:12 am, 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 >

[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 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 requested could onl

[git-users] Re: repo init fails

2010-11-19 Thread Konstantin Khomoutov
On Nov 19, 9:35 am, sudharsan chandrababu wrote: > I have mirrored the google android code and modified the manifest xml > file to point to my local server to fetch the android code. > > When i try repo init -b i am getting the > following error > ---

[git-users] Re: Output from push

2010-11-23 Thread Konstantin Khomoutov
On Nov 23, 10:33 pm, Roddie Grant wrote: > Could someone kindly explain the following or point me to an explanation. It > is typical of the output from a push. I committed and pushed one file, so > why 9 objects counted, and 5 compressed and delta 3? > > Counting objects: 9, done. > Compressing ob

[git-users] Re: Keep track on releases with git

2010-12-06 Thread Konstantin Khomoutov
On Dec 6, 12:48 pm, Ido Ran wrote: > Hi, > I have a project (C# if it is matter) which I keep inside a git > repository. > Every at the end of each development cycle I release a version of the > project (this is new :) > > There are then few possible actions: > 1. Continue to develop and never lo

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

2010-12-06 Thread Konstantin Khomoutov
On Dec 5, 11:43 pm, Roddie Grant wrote: > I develop websites on my laptop. Every so often I commit and push to the > remote test server to see how things run there, merging to its local > "nowork" branch. Inevitably there are one or two very minor wrinkles. I fix > these on the laptop and then pus

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

2010-12-06 Thread Konstantin Khomoutov
On Dec 5, 11:43 pm, Roddie Grant 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 for human bei

[git-users] Re: Output from push

2010-12-10 Thread Konstantin Khomoutov
On Nov 24, 2:20 pm, Roddie Grant wrote: [...] >> To make things simpler to grok, you can think of all those three types >> of objects as being plain text files. >> Playing with `git ls-tree` and `git cat-file` can give a very clear >> idea about how objects reference one another. > Thanks Konstan

Re: [git-users] Re: Output from push

2010-12-10 Thread Konstantin Khomoutov
Rick DeNatale wrote: [...] >> I've spotted one minor deficiency in the article so far (there's no >> such thing as the "HEAD of the current branch" as Git maintains just >> one HEAD ref) > Not exactly. > > .git/HEAD contains an indirect reference to a git ref so, if I'm > working on the branch foo

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

[git-users] Re: pulling from a git svn repo locally

2010-12-10 Thread Konstantin Khomoutov
steve.maring wrote: [...] > $ git svn clone -s http://192.168.1.10/svn/project project > > that will checkout http://192.168.1.10/svn/project/trunk to project > > now, I go over to my shared folder space and make a git repo ... [...] > and then, the interesting thing to note is that over in /home/

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

2010-12-10 Thread Konstantin Khomoutov
Marcello Henrique wrote: > The first option, commits made by different committers which are, in > fact, the same person. Then you should probably use a properly instrumented call to `git filter-branch --commit-filter` According to the git-filter-branch manual [1], it exports a set of environment va

[git-users] Re: Output from push

2010-12-11 Thread Konstantin Khomoutov
On Dec 10, 9:48 pm, Rick DeNatale wrote: > > The idea is that the "HEAD" is a distinguished reference, which is > > used to point to the commit object on which the work tree is based, > > and it has no inherent relation to the notion of the "current branch". > > Actually .git/HEAD is exactly where

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

2011-01-02 Thread Konstantin Khomoutov
On Sun, Jan 02, 2011 at 08:04:14AM -0800, navtis wrote: > I'm new to git, and am looking for advice on the best way to create a > moderately complicated setup with the following constraints: > > * The main public repository for this software is subversion, and is > not under my control > * I need

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 longst

Re: [git-users] Failing command: git config --global user.name "RichardOnRails"

2011-01-08 Thread Konstantin Khomoutov
On Sat, Jan 08, 2011 at 03:28:19PM -0800, RichardOnRails wrote: > When I issue the following command in a Command window: > K:\>git config --global user.name "RichardOnRails" > I get the following response: > The system cannot find the path specified. > > I'm a Git nubie running Git 1.7.3.1 on Wi

Re: [git-users] Failing command: git config --global user.name "RichardOnRails"

2011-01-08 Thread Konstantin Khomoutov
On Sat, Jan 08, 2011 at 03:28:19PM -0800, RichardOnRails wrote: > When I issue the following command in a Command window: > K:\>git config --global user.name "RichardOnRails" > I get the following response: > The system cannot find the path specified. Oh, and I forgot to add that this is most proba

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.

Re: [git-users] Drop changes in the tree, keep index

2011-01-27 Thread Konstantin Khomoutov
On Thu, 27 Jan 2011 01:48:02 -0800 (PST) Thomas Ferris Nicolaisen wrote: > Say I have this: > > # On branch master > # Changes to be committed: > # (use "git reset HEAD ..." to unstage) > # > # modified: foo > # > # Changed but not updated: > # (use "git add ..." to update what will be com

Re: [git-users] Drop changes in the tree, keep index

2011-01-27 Thread Konstantin Khomoutov
On Thu, 27 Jan 2011 02:20:20 -0800 (PST) Thomas Ferris Nicolaisen wrote: > Brilliant, that was simpler than I could imagine :) > > Do you know if the dashes are even necessary? Here it worked without > them. Not necessary as long as Git can figure out you mean a pathname, not a branch name. In

<    4   5   6   7   8   9   10   11   12   13   >