Re: [git-users] git checkout doesn't work?

2013-01-10 Thread William Mizuta
You are right. Git checkout should remove your modifications in the file. Maybe it's a bug. Send it to the git technical list at vger.kernel.org ( http://vger.kernel.org/vger-lists.html#git) If you want to remove your modification, instead of using the file to the git checkout command, use the

Re: [git-users] can't have a directory named bundle?

2013-01-08 Thread William Mizuta
Do you a have a file named .gitignore in the project root? If you have, all files and directories listed in this file will be ignored by git. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Wed, Jan 9, 2013 at 12:34 AM, msoulier msoul...@digitaltorque.ca wrote: Hi, I

Re: [git-users] git reset changes something?

2012-12-24 Thread William Mizuta
If you type git reset without any state, the git will use the HEAD state. So, if you have a file in 'changes to be commited' state, it will return to 'untracked' or 'changes but not updated' state. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Dec 24, 2012 at 3:51 PM,

Re: [git-users] display git notes for a specific sha

2012-12-20 Thread William Mizuta
Hello Krishna, have you ever tried to use git notes show command? You can pass a SHA after the show to specify a commit: git notes show SHA William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Fri, Dec 21, 2012 at 3:33 AM, krishna chaitanya kurnala kkc...@gmail.com wrote: git log

Re: [git-users] Is it possible cp some file from one branch to another without switch branch

2012-12-17 Thread William Mizuta
You can use the option -r in git ls-tree to show all files from a branch: git ls-tree -r B With that, you can use a grep to find the file you are searching. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Dec 17, 2012 at 12:27 PM, Thomas Ferris Nicolaisen

Re: [git-users] Git newbie trying to form a development workflow

2012-12-16 Thread William Mizuta
Hello Chen, it is really a big problem when we have tasks that depends on other tasks. To avoid this, our PO try to select tasks that don't depend on each other per iteration. In the next iteration, if the task is done (it includes code-review, test...), the PO selects a task that depends on

Re: [git-users] Git newbie trying to form a development workflow

2012-12-12 Thread William Mizuta
Hey Bryan, in my current project, we use feature branch to do our tasks, i.e. for each task we create a new branch in the main repository and everyone can commit in this branch. Once the task is completed and approved, we merge the branch into the main (master) and delete this branch. With this

Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic

2012-12-10 Thread William Mizuta
You need to realize a git submodule update to update your kvm part. Remember that you need to push your kvm project change and your main project. You can check this site ( http://git-scm.com/book/en/Git-Tools-Submodules ) for more information about git submodule. William Seiti Mizuta

Re: [git-users] Digest for git-users@googlegroups.com - 4 Messages in 1 Topic

2012-12-10 Thread William Mizuta
What do you get when you use git submodule update? William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Tue, Dec 11, 2012 at 1:22 AM, lei yang yanglei.f...@gmail.com wrote: On Tue, Dec 11, 2012 at 11:00 AM, lei yang yanglei.f...@gmail.com wrote: On Tue, Dec 11, 2012 at 10:02 AM,

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

2012-12-08 Thread William Mizuta
If you know the directory hash code, you can use git ls-tree hash. To know your directory hash you can use git ls-tree HEAD, which shows you every file/directory hash of your project root. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Sat, Dec 8, 2012 at 7:07 PM, Ryan Hodson

Re: [git-users] multiple eclipse projects using single repository

2012-12-06 Thread William Mizuta
You need one .project for each eclipse project. So, you need diferent subdirectories for each one of your eclipse project. However, that's not a good solution. I recommend to create a git repository for each one of your eclipse projects. William Seiti Mizuta @williammizuta Desenvolvedor da

Re: [git-users] permanent branch deletion on origin

2012-11-26 Thread William Mizuta
I think that git branch -rD only deletes the local reference to remote branches. If you want to delete the branch in your remote repository, for example PWB1, type git push origin :PWB1 William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Nov 26, 2012 at 1:06 PM, Jeffrey

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

2012-11-26 Thread William Mizuta
Try to use git rm -r /web/tests to remove the directory from your git project. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Nov 26, 2012 at 2:18 PM, Huu Da Tran huuda.t...@gmail.com wrote: Hi all, I'm trying to exclude a new subdirectory that was added by someone

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

2012-11-26 Thread William Mizuta
As far as I know about git, these objects are not deleted. And not only the file, but also the objects that represent the tree and commit. You can check this using git fsck --full. This command will find dangling objects and you can see its content using git cat-file -p sha1sum. If you want to

Re: [git-users] Re: Git clone shows Initialized empty Git repository in what/ever/.git/

2012-11-19 Thread William Mizuta
Do you have a commit on your bare repository? The message Initialized empty Git repository in what/ever/.git/ indicates that your bare repository doesn't have a commit yet. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Nov 19, 2012 at 6:35 PM, John McKown

Re: [git-users] Unable to push

2012-11-05 Thread William Mizuta
Is there conflicts in your repository? What is the result of a git status? If there is no conflicts, I think that someome pushed new commits and you need to do a git pull --rebase again. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Mon, Nov 5, 2012 at 6:54 PM,

Re: [git-users] Unable to push

2012-11-05 Thread William Mizuta
Try to say the branch you want to pull and push: git pull origin nov2012 --rebase git push origin nov2012 William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Tue, Nov 6, 2012 at 3:43 AM, kramer.newsreader kramer.newsrea...@gmail.com wrote: Is your remote a 'bare' repository,