Re: [git-users] git status after git commit
You can use the command `git whatchanged` to list files that were modified in previous commits. If you want to see the changes, use `git whatchanged -p` or `git log -p` command. *William Seiti Mizuta * Engenheiro de Software Elo7 elo7.com.br <http://www.elo7.com.br/> On Tue, Oct 13, 2015 at 6:23 AM, nmh wrote: > i did > git clone > > made some changes, > > git status show files changed. > (a,b,c,d) (lets assume) > > git commit -a > > git review. > > > = > > now i am back in my local dir. > git status > > git status > On branch bug/1436865 > nothing to commit, working directory clean > > but i want to rework upon those files. > > i want to see the files changed in git status and git diff again. > > i want to see their prev version so that i can see > git diff properly and work upon changes. > > how to do that ? > > > > > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Why is the Mac OS X version always way behind the latest Git version?
If you want a newer version, you need to compile the source code. For that, clone the git repository (https://github.com/git/git), follow the instructions in INSTALL file (https://github.com/git/git/blob/master/INSTALL) and have fun. *William Seiti Mizuta * Engenheiro de Software Elo7 elo7.com.br <http://www.elo7.com.br/> On Sun, Apr 13, 2014 at 7:13 AM, Bjørn T Johansen wrote: > Just wondering why the Mac OS X version is always behind the latest Git > version? > Is there a particular reason or is it that it's just not bothered being > built that often that new versions of Git is released? > > How can I build new versions of Git myself? > > > Regards, > > BTJ > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Git repo inside IGNORED subfolder of another Git repo
Why don't you use submodule (http://git-scm.com/book/en/Git-Tools-Submodules) or subtree? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Nov 20, 2013 at 1:47 AM, Алексей Баранов wrote: > I'm voting for a new Git feature. Git repo inside subfolder of another Git > repo should be separate one WHEN THIS SUBFOLDER IGNORED (.gitignore) BY > PARENT REPO. > > /Main site > /.git- repo of Main site > .gitingore (/vendor/) - subfolder vendor ignored by Git > /vendor- ignored subfolder > /alexey_baranov > /mylib1- I would like to commit/push/pull this lib rhight > from hire > /.git > /bylib2 - I would like to commit/push/pull this lib rhight > from hire > /.git > > This would very halpfull because exactly same fs structure created by > composer (php package dependence utility) And I would like to commit my > libs right from mine site. I do not see any troubles with this when folder > ignored by parent Git repo. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] .gitignore question
Can you ignore all subdirectories inside cache directory? If so, just write cache in your .gitignore file. Git will ignore all cache directories independently where it was. It can be in project root or inside a directory. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Nov 13, 2013 at 11:15 AM, wrote: > I have some files that I want to ignore but can't seem to come up with the > correct format. There are multiple sub-directories with the same path that > I want to ignore. Specifically, the are '/system/cache' and > all start with 'cache.'. The .gitignore entry I am using is: > > system/cache/cache.* > > But that does not work. What is the correct syntax to ignore these files? > TIA. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: git clean help
In which directory have you run the "git clean -fd" command? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Nov 13, 2013 at 1:01 AM, PJ Weisberg wrote: > On Nov 12, 2013 7:32 PM, "David R" wrote: > > > > $ git status > > # On branch master > > # Untracked files: > > #(use "git add ..." to include in what will be committed) > > # > > # Spoon-Knife/ > > nothing added to commit but untracked files present (use "git add" to > track) > > > > > > the spoon-knife is what im trying to clean through git > > Are there files in that directory that are covered by .gitignore rules, > maybe? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: git clean help
This empty directory is under "untracked files" state? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Nov 12, 2013 at 12:04 AM, David R wrote: > git status shows the empty directory that im trying to clean > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] git clean help
What is the result of the command git status? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Mon, Nov 11, 2013 at 11:08 PM, David R wrote: > Hi, I am trying to use git clean -fd to remove an empty directory, however > it keeps skipping over it. I cant figure out why, any help appreciated > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] I'm struggling with the basics (2.2)
Can you show all the output of the command git status? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sat, Nov 2, 2013 at 2:56 PM, icevermin wrote: > Yes I put a readme file inside of the "grit' directory. I'm following the > tutorial about learning Git that is on the website (found here: > http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository) > > On Saturday, November 2, 2013 2:48:09 AM UTC-4, William Seiti Mizuta wrote: > >> Do you have a README file inside grit directory? And do you need to track >> all those files listed? If you don't, create a file named .gitignore and >> put the files that you don't want to track. You can use terminal regex. For >> more info, read the following links: >> >> https://help.github.com/articles/ignoring-files >> >> >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> >> On Sat, Nov 2, 2013 at 4:23 AM, icevermin wrote: >> >>> I'm trying to figure out how to do the "check status stuff" >>> >>> (I'm using Windows 7). When I type "git status" into the terminal (after >>> having created this grit folder), I get this crazy stuff >>> http://i.imgur.com/aYqBp8A.png . Then when I try to add README to the >>> directory (grit directory), and then track it, I get errors. >>> http://imgur.com/xxZJotJ >>> >>> Can somebody help me figure out what I'm doing wrong? thank you. >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+...@googlegroups.com. >>> >>> For more options, visit https://groups.google.com/groups/opt_out. >>> >> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] I'm struggling with the basics (2.2)
Do you have a README file inside grit directory? And do you need to track all those files listed? If you don't, create a file named .gitignore and put the files that you don't want to track. You can use terminal regex. For more info, read the following links: https://help.github.com/articles/ignoring-files William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sat, Nov 2, 2013 at 4:23 AM, icevermin wrote: > I'm trying to figure out how to do the "check status stuff" > > (I'm using Windows 7). When I type "git status" into the terminal (after > having created this grit folder), I get this crazy stuff > http://i.imgur.com/aYqBp8A.png . Then when I try to add README to the > directory (grit directory), and then track it, I get errors. > http://imgur.com/xxZJotJ > > Can somebody help me figure out what I'm doing wrong? thank you. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Another easy merge question
If you want to use the changes in the commits after, yes. If you don't need these commits anymore, you can just use "git reset --hard origin/master" and all your commits that you haven't pushed yet will be "almost" lost. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Oct 30, 2013 at 3:39 PM, Eric Fowler wrote: > Given that I have already made a commit of my new changes in master (but > not a push), is this still the way to go? > > Eric > > > On Tue, Oct 29, 2013 at 4:43 PM, William Seiti Mizuta < > william.miz...@gmail.com> wrote: > >> Hi Eric, >> >> to not lose your changes, you can create a branch which represents your >> current state of your repository. For this, just create a branch with "git >> branch fallback" command. It will be a copy of your current branch, so run >> this command when you are at master branch. >> >> Then, you can return to your remote master state with "git reset --hard >> origin/master". When you want to recover the modifications, just merge the >> content of fallback branch: "git merge fallback". >> >> >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> >> On Tue, Oct 29, 2013 at 9:07 PM, Eric Fowler wrote: >> >>> I did a commit and push into master a while back. I stayed in master and >>> made some changes, which I have committed but not pushed. >>> >>> I want to store the changes but revert my working code to the code I >>> last pushed (for some regression testing), without permanently discarding >>> the new changes. >>> >>> How can I do this? >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+unsubscr...@googlegroups.com. >>> >>> For more options, visit https://groups.google.com/groups/opt_out. >>> >> >> -- >> You received this message because you are subscribed to a topic in the >> Google Groups "Git for human beings" group. >> To unsubscribe from this topic, visit >> https://groups.google.com/d/topic/git-users/xwpB4rnT2Kg/unsubscribe. >> To unsubscribe from this group and all its topics, send an email to >> git-users+unsubscr...@googlegroups.com. >> >> For more options, visit https://groups.google.com/groups/opt_out. >> > > > > -- > cc:NSA > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Another easy merge question
Hi Eric, to not lose your changes, you can create a branch which represents your current state of your repository. For this, just create a branch with "git branch fallback" command. It will be a copy of your current branch, so run this command when you are at master branch. Then, you can return to your remote master state with "git reset --hard origin/master". When you want to recover the modifications, just merge the content of fallback branch: "git merge fallback". William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Oct 29, 2013 at 9:07 PM, Eric Fowler wrote: > I did a commit and push into master a while back. I stayed in master and > made some changes, which I have committed but not pushed. > > I want to store the changes but revert my working code to the code I last > pushed (for some regression testing), without permanently discarding the > new changes. > > How can I do this? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: Very newbie question: how to open a .git file?
If it is a git repository, try to clone it with the command git clone file.git William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Mon, Oct 28, 2013 at 3:25 AM, wrote: > I actually received a .git file that is supposed to contain the project > repository. > > > On Sunday, October 27, 2013 8:29:47 PM UTC-6, googl...@gmail.com wrote: >> >> Thanks. >> > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Very newbie question: how to open a .git file?
.git is a directory, not a file. And I don't recommend you to change anything inside it if you are not very sure of. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Mon, Oct 28, 2013 at 12:29 AM, wrote: > Thanks. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Empty Commit?
Yes, that might be the cause. Then, you can discard the last commit with git reset --hard HEAD^ or create an empty commit with git commit --allow-empty William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Oct 22, 2013 at 2:55 PM, Vicki Kozel wrote: > Also, my file on the branch that I am amending looks exactly like the file > in master. I checked their SHA1 signatures with git hash-object command - > they are identical. Maybe that what is causing the problem? > > > On Tuesday, October 22, 2013 11:53:25 AM UTC-7, Vicki Kozel wrote: >> >> Thank you William, >> I just tried that - same outcome. >> Vicki >> >> On Tuesday, October 22, 2013 11:24:29 AM UTC-7, William Seiti Mizuta >> wrote: >>> >>> >>> On Tue, Oct 22, 2013 at 2:20 PM, Vicki Kozel wrote: >>> >>>> git commit COMMON/pom.xml --amend >>> >>> >>> You don't need to pass the file in commit command. You just need to use >>> "git commit --amend" >>> >>> >>> William Seiti Mizuta >>> @williammizuta >>> Caelum | Ensino e Inovação >>> www.caelum.com.br >>> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Empty Commit?
On Tue, Oct 22, 2013 at 2:20 PM, Vicki Kozel wrote: > git commit COMMON/pom.xml --amend You don't need to pass the file in commit command. You just need to use "git commit --amend" William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Empty Commit?
Hi Vicky, have you added your modified files to "changes to be commited" state? What is the output of "git status" command? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Oct 22, 2013 at 1:01 PM, Vicki Kozel wrote: > Hello, > we are using Git and Gerrit stack; since Gerrit is good about keeping > track of an individual commits(changes), when a commit breaks CI, Gerrit a) > prevents the change to be merged into master b)provides a patch branch a > developer can checkout and amend the broken commit. > > I got into the situation when I made a change "A" that broke that build, > so gerrit never merged the change into a master. I then checked out a patch > with my change in it on top of history and reverted my change "A" to look > like it looked before (and equivalent to a current master). "git status" > tells me that I do have a modified file in my branch. But "git commit" > tells me that my commit is empty. > > Is this because the SHA1 of the fixed file on my branch and SHA1 of the > same file on the master are identical? To fix the situation I just add an > empty line to a reverted file, to make it look a little different from > master, and then git does not complain about an empty commit. What is the > right practice in a situation like this? > > Thank you. > Vicki > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] invert gitignore
Hi Philipp,
you can put the character "!" to negate the pattern:
-
An optional prefix "!" which negates the pattern; any matching file
excluded by a previous pattern will become included again. If a negated
pattern matches, this will override lower precedence patterns sources. Put
a backslash ("\") in front of the first "!" for patterns that begin with
a literal "!", for example, "\!important!.txt".
Reference: http://git-scm.com/docs/gitignore#_pattern_format
William Seiti Mizuta
@williammizuta
Caelum | Ensino e Inovação
www.caelum.com.br
On Tue, Oct 22, 2013 at 9:20 AM, Philipp Kraus
wrote:
> Hello,
>
> I use my .gitignore to define files which should not store in the history,
> but can I use an invert filter?
> So I would define files, which are only stored in the history. So if I
> write to the (not)ignore file *.cpp all other file except *.cpp are ignored?
>
> So I need the invert / complement definition of gitignore
>
> Thanks
> Phil
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Do I need to track a directory to be able to subtree and push it to a different remote branch?
I think that you can use a hook instead of sending the dist folder. Send the app folder and then you run your grunt task in a remote hook. You can read more about server side hooks here: http://git-scm.com/book/en/Customizing-Git-Git-Hooks#Server-Side-Hooks William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Oct 11, 2013 at 12:03 AM, Stereokai wrote: > I use one repo with develop and release branches for a Yeoman project. > > Simplified, my directory tree looks like this: > > root git directory > ├── app > └── dist (the build folder) > > > With Grunt.js I build my app straight into dist. > > I would like to use git subtree push --prefix dist origin release to > conveniently update release with a new build - as detailed in the Yeoman > documentation <http://yeoman.io/deployment.html>. > > Do I need to track, commit and push the dist directory in the developbranch > at all times to use this method? > > I would like to know as well - since on my own, I could not make the above > work conveniently - would a submodule tracking the release branch be a > better solution? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to add my local repository files to a server repository?
If you have used this command: git remote add myserver user@myserver :/var/www/server_git, then your remote repository is aliased myserver. So, for the reset command, you need to tell that you are using myserver: git reset --hard myserver/master. You can check this by listing the remote branches: git branch -r William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sun, Sep 15, 2013 at 3:49 AM, Stephan Nikolaus < stephan.nikol...@googlemail.com> wrote: > No parameters, just the adress and path of remote server. > Must there be some more parameter(s)? > > Regards, > Stephan > > > 2013/9/15 William Seiti Mizuta > >> When you executed the command: git remote add, what were the parameters >> that you used? >> >> >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> >> -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to add my local repository files to a server repository?
When you executed the command: git remote add, what were the parameters that you used? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sat, Sep 14, 2013 at 3:35 PM, Stephan Nikolaus < stephan.nikol...@googlemail.com> wrote: > Yes, i did. Sorry, it was just a typing error in the email. > > > 2013/9/14 William Seiti Mizuta > >> You changed the order. It is >> >> git reset --hard origin/master >> >> >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> >> On Sat, Sep 14, 2013 at 6:26 AM, Stephan Nikolaus < >> stephan.nikol...@googlemail.com> wrote: >> >>> Hi, >>> >>> it was not succesfully. The following message came: >>> $ git reset --hard master/origin >>> fatal: ambiguous argument 'origin/master': unknown revision or path not >>> in the working tree. >>> [...] >>> >>> >>> >>> >>> 2013/9/13 William Seiti Mizuta >>> >>>> >>>> On Fri, Sep 13, 2013 at 6:38 PM, Stephan Nikolaus < >>>> stephan.nikol...@googlemail.com> wrote: >>>> >>>>> cd mylocal >>>>> git remote add myserver user@myserver:/var/www/server_git >>>>> fetch myserver >>>>> git reset --hard origin/master >>>>> >>>> >>>> You are correct. Just clean every file in your mylocal directory before >>>> using the commands. >>>> >>>> >>>> >>>> William Seiti Mizuta >>>> @williammizuta >>>> Caelum | Ensino e Inovação >>>> www.caelum.com.br >>>> >>>> -- >>>> You received this message because you are subscribed to a topic in the >>>> Google Groups "Git for human beings" group. >>>> To unsubscribe from this topic, visit >>>> https://groups.google.com/d/topic/git-users/tX2HCxXiNds/unsubscribe. >>>> To unsubscribe from this group and all its topics, send an email to >>>> git-users+unsubscr...@googlegroups.com. >>>> For more options, visit https://groups.google.com/groups/opt_out. >>>> >>> >>> >>> >>> -- >>> SPD Burgwedel >>> Stv. Vorsitzender und Mitgliederbeauftragter >>> Großburgwedeler Str. 15a >>> 30938 Burgwedel >>> 05139/ 97 14 50 >>> 01525/ 890 78 20 >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+unsubscr...@googlegroups.com. >>> >>> For more options, visit https://groups.google.com/groups/opt_out. >>> >> >> -- >> You received this message because you are subscribed to a topic in the >> Google Groups "Git for human beings" group. >> To unsubscribe from this topic, visit >> https://groups.google.com/d/topic/git-users/tX2HCxXiNds/unsubscribe. >> To unsubscribe from this group and all its topics, send an email to >> git-users+unsubscr...@googlegroups.com. >> For more options, visit https://groups.google.com/groups/opt_out. >> > > > > -- > SPD Burgwedel > Stv. Vorsitzender und Mitgliederbeauftragter > Großburgwedeler Str. 15a > 30938 Burgwedel > 05139/ 97 14 50 > 01525/ 890 78 20 > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to add my local repository files to a server repository?
You changed the order. It is git reset --hard origin/master William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sat, Sep 14, 2013 at 6:26 AM, Stephan Nikolaus < stephan.nikol...@googlemail.com> wrote: > Hi, > > it was not succesfully. The following message came: > $ git reset --hard master/origin > fatal: ambiguous argument 'origin/master': unknown revision or path not in > the working tree. > [...] > > > > > 2013/9/13 William Seiti Mizuta > >> >> On Fri, Sep 13, 2013 at 6:38 PM, Stephan Nikolaus < >> stephan.nikol...@googlemail.com> wrote: >> >>> cd mylocal >>> git remote add myserver user@myserver:/var/www/server_git >>> fetch myserver >>> git reset --hard origin/master >>> >> >> You are correct. Just clean every file in your mylocal directory before >> using the commands. >> >> >> >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> -- >> You received this message because you are subscribed to a topic in the >> Google Groups "Git for human beings" group. >> To unsubscribe from this topic, visit >> https://groups.google.com/d/topic/git-users/tX2HCxXiNds/unsubscribe. >> To unsubscribe from this group and all its topics, send an email to >> git-users+unsubscr...@googlegroups.com. >> For more options, visit https://groups.google.com/groups/opt_out. >> > > > > -- > SPD Burgwedel > Stv. Vorsitzender und Mitgliederbeauftragter > Großburgwedeler Str. 15a > 30938 Burgwedel > 05139/ 97 14 50 > 01525/ 890 78 20 > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to add my local repository files to a server repository?
On Fri, Sep 13, 2013 at 6:38 PM, Stephan Nikolaus < stephan.nikol...@googlemail.com> wrote: > cd mylocal > git remote add myserver user@myserver:/var/www/server_git > fetch myserver > git reset --hard origin/master > You are correct. Just clean every file in your mylocal directory before using the commands. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to add my local repository files to a server repository?
Hi Stephan, do you want to copy the branch master state of your remote repository to your local branch master? If yes, you can do it using the command: git reset --hard origin/master With that you will lose all changes that are in your local branch but not in your remote branch. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Sep 13, 2013 at 5:35 PM, Stephan Nikolaus < stephan.nikol...@googlemail.com> wrote: > Hi, > > i have a local repository and want to change the master branch to a server > git. (I just don't want to delete all files in repository and then clone > the server files) > How to do that? I guess I have to fetch server data into local dir, merge > an push it. > Can someone please explain me how to do? > > Regards, > > Stephan > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Can you mark a commit as authoritative in interactive rebase?
I am not very sure, but I think you can use the option strategy to what you want. Reading the documentation, it says "using the ours strategy simply discards all patches from the , which makes little sense" So, I think you can use it to discard all changes from the other commits. It is just a guess. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Sep 13, 2013 at 9:48 AM, Stoney Jackson wrote: > I have many commits: A, B, C, ..., Z. I plan to do some housekeeping using > rebase. One thing I want to do is to reorder Z to be the first commit. > However, other commits will be in conflict with Z's changes. I know I can > go through and interactively resolve the conflicts manually. But this is > tedious and error prone. I would like to be able to mark Z's changes as > authoritative while rebasing. That is, I want to tell git, "whenever a > commit conflicts with Z (during this rebase operation) I want you to keep > Z's changes and ignore the other." Is this possible? Is there another > (hopefully better) way to accomplish what I'm trying to do? > > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] avoid git deleting tags file
Hi Dexter, you are using option x in git clean command. In the manual, the option x tells: -x Don’t use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with -e options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with git reset) to create a pristine working directory to test a clean build. So, if you don't want to delete files in .gitignore, just don't use the option x, only the options f and d: git clean -fd William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Sep 3, 2013 at 10:33 AM, dexter ietf wrote: > hi, > > when i run git clean -xfd, git deletes my tags file. > i have the tag file listed in gitignore, but how do > i tell git not to remove the tags file. > > -dexter > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] git branch : strange !
Hi, git doesn's save changes in a branch. Only commits are saved in an specific branch. So, if you have a change in a file and change the branch, this change will be at the new branch. If you don't want it, you need to commit or stash the change before changing branch. If changing a branch will cause a conflict of a modified file with a change in the branch that you want to change, Git you tell you that you need to commit before changing the branch. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Aug 30, 2013 at 12:21 PM, djsuperfive wrote: > Hi ! > > I'm learning git and have a strange issue with a simple branch scenario: > > I created a new local branch "dev". > So now I have two local branches: master and dev.On master, everything > isup to date: nothing to add, nothing to commit. > > I've checked out the branch "dev" and made a change in one file. I haven't > committed anything yet after this change. > A git status tells me: > # On branch dev > # Changes not staged for commit: > # (use "git add ..." to update what will be committed) > # (use "git checkout -- ..." to discard changes in working > directory) > # > # modified: index.php > # > no changes added to commit (use "git add" and/or "git commit -a") > > Now I go back to "master" (git checkout master), and a "git status" tell > me the following: > # On branch master > # Changes not staged for commit: > # (use "git add ..." to update what will be committed) > # (use "git checkout -- ..." to discard changes in working > directory) > # > # modified: index.php > # > no changes added to commit (use "git add" and/or "git commit -a") > > Why do I have a change to add on master whereas I made this change on my > branch "dev" ? > > What do you think ? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Can I use GitHub ?
First of all, Git is different of Github. Git is a version control system and Github is an online service where you can keep your git projects. Now, answering your questions: - Git is a cross-platform software. You can use it in Linux, Mac and Windows. In Ubuntu, there is a package where you can install using apt-get. - With git installed, you will be able to use it in command line. But, if you don't want use in command line, there is some softwares that offers you a GUI experience. Also, there is a plugin in eclipse that integrates with Git (EGit). William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Thu, Aug 29, 2013 at 10:58 PM, Varun Prasad Yadav Gunasekaran < varunprasa...@gmail.com> wrote: > Hello All, > > I am entirely new to Git but I do have exposure with source control > systems in the past. > Heres the thing : > > I would like to publish my android project and I heard that Git can be > integrated with Eclipse. Is it true ?. > Also do note that my OS of development is Ubuntu 13.04. > > Can I use Git for version controlling in this setup (Ubuntu, Git and > Eclipse) ? > > Thanks for your time > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Strange problem on Mac OS X git 1.8.4
Using the command git diff, what is the differences that git tells you about the files? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Aug 28, 2013 at 2:34 AM, TC Wan wrote: > > On Wednesday, August 28, 2013 12:58:15 PM UTC+8, William Seiti Mizuta > wrote: >> >> Hi Tat-Chee >> >> I didn't get your problem. Can you tell a little more about it? >> >> >> > The repository was clean and freshly cloned from github. On Linux, it > shows "nothing to commit, working directory clean". > But on Mac OSX, it indicates that there are changed files in the > repository (from the given listing) which was just cloned and should not > have any changes. > > > >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> >> On Wed, Aug 28, 2013 at 12:09 AM, Tat-Chee Wan wrote: >> >>> Hi, >>> >>> I'm having a strange problem with git but only on Mac OS X. >>> There is a public repository https://github.com/mindboards/** >>> ev3sources.git <https://github.com/mindboards/ev3sources.git> which >>> when cloned to Linux works correctly, but when cloned to Mac OS X (tested >>> on 10.8.4, git 1.8.4), gives the following output immediately after a fresh >>> clone: >>> >>> $ git --version >>>> git version 1.8.4 >>> >>> $ git status >>>> # On branch master >>>> # Changes not staged for commit: >>>> # (use "git add ..." to update what will be committed) >>>> # (use "git checkout -- ..." to discard changes in working >>>> directory) >>>> # >>>> #modified: extra/linux-03.20.00.13/**Documentation/IO-mapping.txt >>>> #modified: extra/linux-03.20.00.13/**include/linux/netfilter/xt_* >>>> *CONNMARK.h >>>> #modified: extra/linux-03.20.00.13/**include/linux/netfilter/xt_* >>>> *DSCP.h >>>> #modified: extra/linux-03.20.00.13/**include/linux/netfilter/xt_* >>>> *MARK.h >>>> #modified: extra/linux-03.20.00.13/**include/linux/netfilter/xt_* >>>> *RATEEST.h >>>> #modified: extra/linux-03.20.00.13/**include/linux/netfilter/xt_* >>>> *TCPMSS.h >>>> #modified: extra/linux-03.20.00.13/** >>>> include/linux/netfilter_ipv4/**ipt_ECN.h >>>> #modified: extra/linux-03.20.00.13/** >>>> include/linux/netfilter_ipv4/**ipt_TTL.h >>>> #modified: extra/linux-03.20.00.13/** >>>> include/linux/netfilter_ipv6/**ip6t_HL.h >>>> #modified: extra/linux-03.20.00.13/net/**ipv4/netfilter/ipt_ECN.c >>>> #modified: extra/linux-03.20.00.13/net/**netfilter/xt_CONNMARK.c >>>> #modified: extra/linux-03.20.00.13/net/**netfilter/xt_DSCP.c >>>> #modified: extra/linux-03.20.00.13/net/**netfilter/xt_HL.c >>>> #modified: extra/linux-03.20.00.13/net/**netfilter/xt_MARK.c >>>> #modified: extra/linux-03.20.00.13/net/**netfilter/xt_RATEEST.c >>>> #modified: extra/linux-03.20.00.13/net/**netfilter/xt_TCPMSS.c >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libip6t_HL.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libipt_ECN.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libipt_TTL.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_CONNMARK.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_DSCP.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_MARK.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_RATEEST.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_SET.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_TCPMSS.so >>>> #modified: extra/linux-devkit/arm-none-** >>>> linux-gnueabi/usr/libexec/**xtables/libxt_TOS.so >>>> #modified: lms2012/lms2012/doc/html/**PWMModule.html >>>> #modified: lms2012/lmssrc/TEST/CVS/**Entries >>>> #
Re: [git-users] Strange problem on Mac OS X git 1.8.4
Hi Tat-Chee I didn't get your problem. Can you tell a little more about it? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Aug 28, 2013 at 12:09 AM, Tat-Chee Wan wrote: > Hi, > > I'm having a strange problem with git but only on Mac OS X. > There is a public repository > https://github.com/mindboards/ev3sources.gitwhich when cloned to Linux works > correctly, but when cloned to Mac OS X > (tested on 10.8.4, git 1.8.4), gives the following output immediately after > a fresh clone: > > $ git --version >> git version 1.8.4 > > $ git status >> # On branch master >> # Changes not staged for commit: >> # (use "git add ..." to update what will be committed) >> # (use "git checkout -- ..." to discard changes in working >> directory) >> # >> #modified: extra/linux-03.20.00.13/Documentation/IO-mapping.txt >> #modified: >> extra/linux-03.20.00.13/include/linux/netfilter/xt_CONNMARK.h >> #modified: extra/linux-03.20.00.13/include/linux/netfilter/xt_DSCP.h >> #modified: extra/linux-03.20.00.13/include/linux/netfilter/xt_MARK.h >> #modified: >> extra/linux-03.20.00.13/include/linux/netfilter/xt_RATEEST.h >> #modified: >> extra/linux-03.20.00.13/include/linux/netfilter/xt_TCPMSS.h >> #modified: >> extra/linux-03.20.00.13/include/linux/netfilter_ipv4/ipt_ECN.h >> #modified: >> extra/linux-03.20.00.13/include/linux/netfilter_ipv4/ipt_TTL.h >> #modified: >> extra/linux-03.20.00.13/include/linux/netfilter_ipv6/ip6t_HL.h >> #modified: extra/linux-03.20.00.13/net/ipv4/netfilter/ipt_ECN.c >> #modified: extra/linux-03.20.00.13/net/netfilter/xt_CONNMARK.c >> #modified: extra/linux-03.20.00.13/net/netfilter/xt_DSCP.c >> #modified: extra/linux-03.20.00.13/net/netfilter/xt_HL.c >> #modified: extra/linux-03.20.00.13/net/netfilter/xt_MARK.c >> #modified: extra/linux-03.20.00.13/net/netfilter/xt_RATEEST.c >> #modified: extra/linux-03.20.00.13/net/netfilter/xt_TCPMSS.c >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libip6t_HL.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libipt_ECN.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libipt_TTL.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_CONNMARK.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_DSCP.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_MARK.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_RATEEST.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_SET.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_TCPMSS.so >> #modified: >> extra/linux-devkit/arm-none-linux-gnueabi/usr/libexec/xtables/libxt_TOS.so >> #modified: lms2012/lms2012/doc/html/PWMModule.html >> #modified: lms2012/lmssrc/TEST/CVS/Entries >> #modified: lms2012/lmssrc/TEST/CVS/Repository >> #modified: lms2012/lmssrc/TEST/TEST/CVS/Entries >> #modified: lms2012/lmssrc/TEST/TEST/CVS/Repository >> #modified: lms2012/lmssrc/TEST/update >> # >> >> $ cat .git/config > [core] > repositoryformatversion = 0 > filemode = true > bare = false > logallrefupdates = true > ignorecase = true > precomposeunicode = false > [remote "origin"] > url = g...@github.com:mindboards/ev3sources.git > fetch = +refs/heads/*:refs/remotes/origin/* > [branch "master"] > remote = origin > merge = refs/heads/master > > Is this a known problem? What is the fix? TIA > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] test version in the index
You can put the not commited changes in the stash (git stash). Then you run the tests and recover the changes with git stash pop. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Aug 23, 2013 at 1:55 AM, wrote: > After making a number of changes, I decide I want to commit some of them > and > continue working on the rest. I do this by moving the desired parts to > the index. > Before committing, it would useful if there were a way to test this commit > alone, > say, so it doesn't break a build. Is there a convenient way to do so? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to ignore commits and push with a Single one?
It is possible, but you will need to change the repository history (local
and on openshift). Changing the history, you will need to do a "git push
-f" to force the history change on a remote repository like on openshift.
If you really want to merge the commits into one commit, you need to get
the commit hash before the ones you want to merge. You can get the hash
with git log. After that, use the command
git rebase -i hash-you-have-coppied
It will open a text editor that shows all commit that came after the commit
you passed to the command. The oldest commit will come in the first line
and the last commit, in the last line. Change the word pick to squash in
the commits that you want to merge into the previous one. When you close
the file, the commits will be merged into the first commit.
William Seiti Mizuta
@williammizuta
Caelum | Ensino e Inovação
www.caelum.com.br
On Tue, Aug 13, 2013 at 12:58 AM, jbsi wrote:
> Hi everybody,
>
> I have one repository on *codebasehq* and I was learning how to deploy my
> application on openshift, then I did a lot of modifications to deploy the
> app on openshift. After each modification I commited e pushed to openshift
> ("git push openshiftGitURL") without clone my codebasehq repository.
>
> After dozens of commits/pushes to openshift the application was deployed
> correctly, and I pretend to push these modifications to codebasehq with a
> single commit. It is possible, isn't it? How can I do this?
>
> Thanks
>
> --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] fatel error
Can you give us a little more information? Like your operating system, git version... William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Jul 24, 2013 at 3:33 AM, Nidhi Arora wrote: > when i use $ git clone git://git.kernel.org/pub/scm/git/git.git > > then fatal error is come: unable to connect to git kernel.org(port 9418)(no > such is know.) > > help me.. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] clone tagged version?
Once you have cloned the project, you can return to any state of it (tag or commit). To do it, you need the tag name or the commit's hash. To list all project tags, use the command git tag. To list the commit's hash, use the command git log. With the tag name or commit's hash, use the command git checkout tagName/hash. It will return your project to the state wanted. For example: tag v1.0:git checkout v1.0 commit 531c8dd4fb18e653d6170d367e4b23c3164d5ce0:git checkout 531c8dd4fb18e653d6170d367e4b23c3164d5ce0 William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Mon, Jul 15, 2013 at 2:31 AM, Ed Pataky wrote: > If I want to use GIT to keep track of source code and documents, and use > the tag feature to mark revisions ... suppose now developers commit version > 1.0 to the repo .. now day to day they make changes, testers test, etc .. > now what if someone wanted to go in and grab the last tagged version, the > full set of files corresponding to a specific tag, is this possible? How to > do it? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] reverting back
I have done a little mistake: with git reset --hard hash-id, you will return to the project state of the commit's hash. With that, all changes that were done after that commit will be lost. with git revert hash-id, you will undo the changes that were done in the commit's hash. So, only one commit will be undone in this case. In both cases, git will change the files t automatically. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sun, Jul 14, 2013 at 3:59 AM, Ed Pataky wrote: > ... and git will put back the old files? > > > On Sat, Jul 13, 2013 at 11:55 PM, William Seiti Mizuta < > william.miz...@gmail.com> wrote: > >> Hi Hwswman, >> >> I don't use SourceTree, but I know how to you do it in command line: if >> you want to delete forever the changes you have done, you need to get the >> commit hash of the commit where you want to return (the commit before the >> mess). For that you can use the command git log to get the hash. With the >> hash, use the command git reset --hard hash-id to return your project to >> state, deleting all changes that were done after that commit. If you want >> only to undo the changes, preserving the mess changes in the history, use >> the command git revert hash-id. >> >> >> William Seiti Mizuta >> @williammizuta >> Caelum | Ensino e Inovação >> www.caelum.com.br >> >> >> On Sun, Jul 14, 2013 at 3:07 AM, HWSWMAN wrote: >> >>> suppose i have a directory with many files .. i commit a good version >>> .. then i make a bunch of changes and i messed something up .. how do i >>> revert back to the old version? will all the files be replaced from the >>> current messed up files to the older good files? i am using SourceTree >>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+unsubscr...@googlegroups.com. >>> >>> For more options, visit https://groups.google.com/groups/opt_out. >>> >>> >>> >> >> -- >> You received this message because you are subscribed to a topic in the >> Google Groups "Git for human beings" group. >> To unsubscribe from this topic, visit >> https://groups.google.com/d/topic/git-users/hpjOxGit-6g/unsubscribe. >> To unsubscribe from this group and all its topics, send an email to >> git-users+unsubscr...@googlegroups.com. >> >> For more options, visit https://groups.google.com/groups/opt_out. >> >> >> > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] reverting back
Hi Hwswman, I don't use SourceTree, but I know how to you do it in command line: if you want to delete forever the changes you have done, you need to get the commit hash of the commit where you want to return (the commit before the mess). For that you can use the command git log to get the hash. With the hash, use the command git reset --hard hash-id to return your project to state, deleting all changes that were done after that commit. If you want only to undo the changes, preserving the mess changes in the history, use the command git revert hash-id. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sun, Jul 14, 2013 at 3:07 AM, HWSWMAN wrote: > suppose i have a directory with many files .. i commit a good version .. > then i make a bunch of changes and i messed something up .. how do i revert > back to the old version? will all the files be replaced from the current > messed up files to the older good files? i am using SourceTree > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] URL return error doing git pull
Oscar, can you show us the content of .git/config file? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Jul 12, 2013 at 12:54 PM, John McKown wrote: > > > On Fri, Jul 12, 2013 at 10:49 AM, John McKown < > john.archie.mck...@gmail.com> wrote: > >> I am not an expert, but if you're repository is being accessed via HTTP:, >> the 403 might be an HTTP result code. In HTTP-speak, it means "forbidden". >> According to the documentation, and rendered in my own dialect, that means: >> "I heard what you said. I understand what you said. But I'm not going to do >> it, so there!" One example from a normal web browser is when you put in the >> name of a directory instead of an actual page, and directory browsing is >> disabled. >> >> what does "git remote -v" say? >> >> >> On Fri, Jul 12, 2013 at 9:20 AM, Oscar wrote: >> >>> I did git pull origin master as you suggested and got this error: >>> >>> error: The requested URL returned error: 403 >>> fatal: Couldn't find remote ref master >>> >>> On Friday, July 12, 2013 1:17:40 AM UTC-5, William Seiti Mizuta wrote: >>>> >>>> >>>> On Fri, Jul 12, 2013 at 12:25 AM, Oscar wrote: >>>> >>>>> Please >>>>> name which branch you want to merge on the command line and >>>>> try again (e.g. 'git pull '). >>>>> >>>> >>>> Following what git has returned, you need to tell what is the name of >>>> the repository and the branch that you want to bring. The default >>>> repository name is origin and if you want to update the master branch from >>>> your repository, then you need to use the following command: git pull >>>> origin master. >>>> >>>> >>>> William Seiti Mizuta >>>> @williammizuta >>>> Caelum | Ensino e Inovação >>>> www.caelum.com.br >>>> >>> -- >>> You received this message because you are subscribed to the Google >>> Groups "Git for human beings" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to git-users+unsubscr...@googlegroups.com. >>> For more options, visit https://groups.google.com/groups/opt_out. >>> >>> >>> >> >> >> >> -- >> This is a test of the Emergency Broadcast System. If this had been an >> actual emergency, do you really think we'd stick around to tell you? >> >> Maranatha! <>< >> John McKown >> > > > > -- > This is a test of the Emergency Broadcast System. If this had been an > actual emergency, do you really think we'd stick around to tell you? > > Maranatha! <>< > John McKown > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] URL return error doing git pull
On Fri, Jul 12, 2013 at 12:25 AM, Oscar wrote: > Please > name which branch you want to merge on the command line and > try again (e.g. 'git pull '). > Following what git has returned, you need to tell what is the name of the repository and the branch that you want to bring. The default repository name is origin and if you want to update the master branch from your repository, then you need to use the following command: git pull origin master. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] git error when trying to push one commit
Hi Richard, what is the return of the command git remote show origin? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Jul 10, 2013 at 4:07 PM, Richard Marais wrote: > I am trying to push just one commit to origin master. However I get an > error saying I first need to fetch then merge, but I get this error after a > pull. Any ideas would be appreciated. > > Richard@RICHARD-PC /e/Work/MH (master) > $ git pull > remote: Counting objects: 27, done. > remote: Compressing objects: 100% (11/11), done. > remote: Total 14 (delta 8), reused 0 (delta 0) > Unpacking objects: 100% (14/14), done. > From file:///V:\ >930430f..3a55dca master -> origin/master > Auto-merging > buyit/src/main/java/com/company/buyit/outgoing/HttpsCallService.java > Merge made by the 'recursive' strategy. > .../java/com/company/buyit/auth/BcagHmacGenerator.java | 2 +- > .../com/company/buyit/outgoing/HttpsCallService.java| 16 ++-- > deployLocal.sh | 2 +- > 3 files changed, 4 insertions(+), 16 deletions(-) > > Richard@RICHARD-PC /e/Work/MH (master) > $ git push origin 72ba712:master > To file:///V:\ > ! [rejected]72ba712 -> master (non-fast-forward) > error: failed to push some refs to 'file:///V:\' > hint: Updates were rejected because the tip of your current branch is behind > hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') > hint: before pushing again. > hint: See the 'Note about fast-forwards' in 'git push --help' for details. > > Here is the list of commits, not the position of 72ba712: > > Richard@RICHARD-PC /e/Work/MH (master) > $ git lol > * eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\ > |\ > | * 3a55dca (origin/master) > * | 72ba712 > * | bc55eb5 > * | c2aa448 Merge branch 'master' of file:///V:\ > |\ \ > | |/ > | * 930430f > * | fc7a55b > * | fd401a5 > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Switching between local Git branches
Hi Dinesh, all files that are listed in "untracked files" and "changes not staged for commit" when you use the command git status will follow you when you change branch. If you don't want it, you need to commit the changes before changing branch. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Thu, Jul 4, 2013 at 1:45 PM, Dinesh Vijayakumar wrote: > Hello Git-users, > I've a question regarding the use of multiple local branches. > > Let's say, I've created a branch b1 and made some changes like adding a > new file to the branch b1 after checking it out. > > Then , I stage the file but not commit it. > > Now I find myself a need to create another branch to work on a high > severity issue. > > So, I checkout local master branch and create another b2 from master. > > Now when I switch to b2, git shows the new file which is added to branch > b1. > > Shouldnt it replace the contents of my working directory with the contents > of parent branch master ? Instead it shows the new file when i do git > status. > > > Can you please explain how does this work ? > > > > Thanks, > Dinesh. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] compare the two branch and only output the content with the "changed files"
You can use the diff command with the option name-only: git diff branch1 branch2 --name-only William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sat, May 25, 2013 at 1:56 PM, lei yang wrote: > Hi experts, > > I know we can use > > git log branch1 branch2 --name-status to get the changed file plus the > commit message > > but if I only want to get the changed files, how could i do > > Thanks > Lei > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Given object file in Git, determine its path, or at least, its contents
William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Thu, May 16, 2013 at 1:14 PM, Dale R. Worley wrote: > I have a brand new, large file in my repository. I know that its > object file is: > > .git/objects/87/266d373359958e4fa9b51808ae076db9303923 > > I would like to determine the path name it has To find the file name with the path, you can use git rev-list --objects --all | grep 87266d373359958e4fa9b51808ae076db9303923. It will show the object hash with its fiile name. > (and in which commit). > To check in which commits this file has been modified, you can use git log --follow > I would also like to be able to extract its file contents (somewhat > like "git show" would do if I knew its path name). > To check the file content, you can use git cat-file -p 87266d373359958e4fa9b51808ae076db9303923 > > I'm sure that there are Git commands to do both of these, but with Git > manual pages, there's no way to find the command unless I already know > ts name. > > Dale > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How do I modify the commit message (not the topmost one) of a git commit?
Hi Norah, you can use the interactive rebase to change a commit message. For this, get the commit's hash of the commit before the one you want to change. For example, if you have the following commits: A -> B -> C -> D -> E -> F where F is the newest commit and you want to change the commit message from commit D, then you will need to get the hash from commit C. With this, use the command git rebase -i hash-C. It will open an editor with commits D, E and F. To change D commit's message, change the word that appears in front of D from pick to reword. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sat, May 4, 2013 at 3:31 AM, Norah Jones wrote: > Hi, > > I did a series of commits and now I find one of my commit (not the topmost > one) has an incorrect commit message. How can I change that specific one? I > believe "git commit --amend" works only for the last commit. > > > Thanks, > Norah Jones > > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] beginners question: Pulling from a remote repository using the repository name
William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Apr 30, 2013 at 9:05 AM, wrote: > I am learning git using a tutorial, and stumbled over the following > problem: > > Starting with my own repository, I had created a bare repository, and > assigned a name to it, like this: > > # I already have a repository my_repo1 > cd ~/my_repo1 > > git clone --bare . ~/github/master.git > git remote add master ~/github/master.git > > Now I created another repository: > > cd ~/my_repo2 > git clone ~/github/master.git . > > > I can now work with the my repositories by pushing and pulling the files. > Everything fine so far. However I noticed the following: > > This works: > > cd ~/my_repo1 > git pull ~/github/master.git > > But this does not: > > git pull master > > The error message I receive is: "You asked to pull from the remote > 'master', but did not specify a branch." > Git says that you need to specify which branch you want to send to the master remote. The default branch name is master, which will be a little confusing. You will need to use the command git pull master master, where the first master is the remote repository and the second is the branch that you want to send. To avoid telling which branch you want to send, you can track an existing local branch to an existing remote branch. For this, use git branch --set-upstream-to=master/master master if you use git 1.7 or git branch -u master/master master if you use git 1.8. With this, a simple git pull master will resolve your problem. > > I thought that my assigning the name "master" to the remote repository, I > can just use this name instead of the long "real" name, but obviously this > is not true. It seems that the command "git remote add" not 'just' adds an > alternative name to the repository, but has some additional semantics. > > Could someone please enlighten be here? > > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] recover from hard reset
William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Mon, Apr 29, 2013 at 3:16 AM, Lei Yang wrote: > hi > > You misunderstand my question,I want to recover my local changes, after I > do a hard reset ,it's gone. > > Sent from my iPhone > > As Thomas said, you can find the stage before the git reset with "reflog" ( http://gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html). For this, you can use git reflog command or git log -g command and get the hash of the state before the git reset command command. With the hash, you can use git merge or rebase with you have new commits that you want to preserve or git reset --hard again to reset to the state before the previous git reset command. > On 2013-4-29, at 14:10, John McKown wrote: > > > I'm no expert, but I'd try: > > > > git reset --hard local_commit > > > > if "local_commit" is some sort of name. Or it can be that long 40 > > character commit value. If you don't know where you want to go back > > to, you might try a > > > > git log > > > > to find the commit value and use it (cut and paste if possible. I > > don't like typing "random" 40 character values.) > > > > Well, it's 01:00 local time. You'd think that a 60-year old would know > > better than to drink a large caffeinated beverage before bed time. > > You'd be wrong, in my case. > > > > BTW, did you mean to do a --mixed (reset HEAD & index) or --soft (only > > reset HEAD). > > > > Note if you did some work between the > > > > git commit local_commit^ > > > > and the > > > > git reset --hard > > > > then you can't recover those changes at all. git did not track them > > and so they are GONE and totally unrecoverable. The reset --hard reset > > both the files in the directory and the index. > > > > On Mon, Apr 29, 2013 at 12:28 AM, lei yang > wrote: > >> Hi experts > >> > >> I commit a change to my local git repos, but I did a git hard --reset > >> local_commit^, and then my local changes disappeared, how could I > >> recover my local changes ? > >> > >> Thanks > >> Lei > >> > >> -- > >> You received this message because you are subscribed to the Google > Groups "Git for human beings" group. > >> To unsubscribe from this group and stop receiving emails from it, send > an email to git-users+unsubscr...@googlegroups.com. > >> For more options, visit https://groups.google.com/groups/opt_out. > > > > > > > > -- > > This is a test of the Emergency Broadcast System. If this had been an > > actual emergency, do you really think we'd stick around to tell you? > > > > Maranatha! <>< > > John McKown > > > > -- > > You received this message because you are subscribed to the Google > Groups "Git for human beings" group. > > To unsubscribe from this group and stop receiving emails from it, send > an email to git-users+unsubscr...@googlegroups.com. > > For more options, visit https://groups.google.com/groups/opt_out. > > > > > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] All commits are 'unpushed'
On Sun, Apr 28, 2013 at 3:11 AM, Alexey Ganzha wrote: > Everything works fine, except i always see long list of unpushed > commits in my magit status screen. > Is it possible to fix it? > Have you ever tried to use git pull? I think that might solve your problem. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to rearrange commits in a repo
You can use the command git rebase with interactive option. To use it, type git rebase -i , where is the commit hash before the list of commits that you want to rearrange. With that, the default editor will open and changing the line order, you will change the commits order. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How can I get base commit-ID when cherry-pick conflict occurs.
Is commit A a commit or a git init command? In your case, commit A will be the BASE if A is really a commit. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Apr 17, 2013 at 5:21 AM, seonguk.baek wrote: > In a normal Git merge conflict, the three versions of a file in play for > the three-way merge are roughly as follows: > > LOCAL: the version from my branch > REMOTE: the version from the other branch > BASE: the version from the common ancestor of the two branches (in > particular, the common ancestor of my branch's HEAD and the other branch's > HEAD) > > When a Git cherry-pick generates a merge conflict, there is no common > ancestor. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How can I get base commit-ID when cherry-pick conflict occurs.
William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Apr 17, 2013 at 5:10 AM, seonguk.baek wrote: > Hello > > case is follows: > > commit A : initial empty commit > commit B : modified a.txt > commit C : modified a.txt > commit D : add b.txt > commit E : modified a.txt > > E <-- master > | > D > | > C > | > B <-- foo_branch > | > A > > I'm in foo_branch. > If I do "git cherry-pick commit-E" then BASE will be commit C. (B will be > LOCAL and E will be REMOTE.) > What do you mean by "BASE", "LOCAL" and REMOTE? > Is this right? and how can I get BASE commit ID? > > Thanks. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] git send-pack: protocol error: bad band #50
Are you using http or git protocol? If you are using git, is port 22 opened? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Apr 10, 2013 at 4:33 PM, João Joyce wrote: > Hi, > > > I am not sure this is the right place to ask. I am having a problem with > pushing files to a remote Git repository. The error I am getting is: > > git send-pack: protocol error: bad band #50 > > fatal: The remote end hung up unexpectedly > > > I am using ubuntu 12.10 in my local machine and 12.04 in the remote (which is > a VPS hosting). The git version is 1.7.9.5 on both. Can anyone point me to > any information that can help me fix this issue? > > > Thank you. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Deploying with git
William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Mon, Apr 8, 2013 at 1:11 PM, wrote: > I've seen many threads and blog posts about my problem but none of them > solved my problem, so I'll ask here if anyone has encountered the same > problem. > > I'm attempting to deploy my website via github. I have created a bare > hub.git repo on the server, I push my local git repo to it, checked if it > worked with a git log and everything was fine. > > I then cloned this repo on the server in a repo called dev and made a > virtual host for it and everything shows up fine. > > I used to push from local to hub and then pull hub from dev and it worked > fine. I wanted to automate this, I wanted to be able to push from local to > hub and automatically pull hub from dev. So I created a post-update file in > hub.git/hooks and put this in it : > > #!/bin/bash > echo > echo "* updating on dev *" > echo > cd /../dev || exit > > Are you sure of this command? Check if the "cd" command are redirecting you to your repository directory. Print the directory with "pwd" to check it. > > unset GIT_DIR > git pull origin master > > I then made sure that my post-update was executable with a > >chmod +x hooks/post-update > > Went back to my local repo, changed a file > >git add . >git commit -m "testing" >git push origin > > This message comes up > >remote : >remote : * updating on dev * >remote : >remote : fatal: Not a git repository (or any parent up to mount point /dev) >remote : Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM > not set). > > I checked and there is a .git in my dev directory and the HEAD hasn't been > renamed or anything. However I do have a HEAD, a FETCH_HEAD and a > ORIGIN_HEAD (don't know if that would change anything). > > I'm not sure what the problem is here. The server is a gentoo x86 (if that > might help at all). Sorry if I'm just missing something obvious or if this > isn't the place to post this. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] yum install git fails on Centos 6.2
On Tue, Mar 26, 2013 at 12:11 PM, Dale R. Worley wrote: > First, you are only verifying that you system has that file, you're > not verifying that RPM thinks you've installed that package. So I'd > start with "rpm -qa | grep '^libz'" to see what RPM thinks the status > of libz is. > It seems that git package uses version 1.2.0 of libz. However, he has version 1.2.7. So, if you want to install git, you will need to downgrade libz version to maintain compatibility or install a new version of git from another repository. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] yum install git fails on Centos 6.2
On Mon, Mar 25, 2013 at 7:52 PM, Steve Owens wrote: > yum install curl-devel expat-devel gettext-devel \ openssl-devel zlib-devel > You don't need to install each library above if you will use git from the repository. It is necessary only if you want to compile git source code. I recommend you to uninstall the packages and install only git. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Did I loose my repository?
Can you run git fsck --full? What is the result? And can you tell us a little more about how have you gotten in this state? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sun, Mar 24, 2013 at 8:14 PM, Tom Avey wrote: > I'm not sure what I did not my git prompt now says ((...)) instead of > master. > > It's been working great for a couple of months (I'm still pretty new to > git) > > git status and branch and add yields "fatal: Not a git repository (or any > of the parent directories): .git." > > git init says it is reinitializing existing Git repository but it doesn't > appear to be fixed. > > My repository is only local as I program alone. > > .git folder still exists. > > Can anyone help? There's at least one branch I would like to recover. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to edit commit messages
Hi Surya, I don't recommend you to change the commit message if you have already sent the commits to the remote repository. However, if you haven't, you can use the commands that Lei wrote to change the commit messages. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Sun, Mar 24, 2013 at 10:49 AM, lei yang wrote: > > > On Sun, Mar 24, 2013 at 9:22 PM, Surya wrote: > >> The open source community in which I am contributing has certain >> standards on writing commit messages I didn't knew earlier. >> >> They want me to edit commit message according to standards.. So, how to >> edit commit messages? >> >> > > git commit --amend for the top commit to edit the commit > > git rebase -i to edit all the commit message from sha1 > > > Lei > > >> -- >> You received this message because you are subscribed to the Google Groups >> "Git for human beings" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to git-users+unsubscr...@googlegroups.com. >> For more options, visit https://groups.google.com/groups/opt_out. >> >> >> > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to prevent git repo to get big file history back
How did you remove the big file's history? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Mar 20, 2013 at 2:34 PM, Ashutosh Kumar wrote: > Hi, > > I am working on removing big file from my git repo and its history as > well. But i am facing one issue .. > > here is my scenario > > 1. Create a repo > 2. Commit and push a big file > 3. Clone the repo in to test_clone1 > 4. Clone the repo in to test_clone2 > 5. Remove the big file’s history (commit and push) in test_clone1 > 6. Commit and push a test file in test_clone2 > 7. Clone the repo in to test_clone3 — I believe the big file’s history > will have come back. > > Do you have any idea, what we can do to neglect this issue if that git > repo is using by many users? > > > Thanks, > > Ashutosh. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Reset working file, but leave index alone
On Thu, Mar 14, 2013 at 3:54 PM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Thu, Mar 14, 2013 at 11:24:27AM -0700, joeriel...@gmail.com wrote: > > > How do I reset one working file, but leave the index alone? git checkout > > file does not do that > > (it appears to do nothing), nor does git checkout -- file. > > > > To clarify, I've edited a file, then added it to the index. I now want to > > leave the change in the index, > > but reset the working file to the checked-in version. > > git checkout HEAD -- file > > or > > git show HEAD:file >file > > `git checkout -- file` did not work for you because if you don't specify > where to get the contents from, it assumes the index -- to cite the > manual: > > When or --patch are given, git checkout does not switch > branches. It updates the named paths in the working tree from the index > file or from a named (most often a commit). > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > You can also use git reset file. It will change a file from index state to modified or untracked state. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: file locking
On Wed, Mar 13, 2013 at 8:16 AM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Wed, 13 Mar 2013 03:15:45 -0700 (PDT) > yosi.tsu...@gmail.com wrote: > > > > > do you know any software that does what i need? > > > > > > Subversion is a popular solution which supports locking. > > > > > > But you just might reconsider your approach as locking is beleived > > > to have its downsides as well. One popular example is a developer > > > locking a bunch of files and going AWOL, which turns locking into a > > > social problem thus throwing you into the same class of problem you > > > have in a lockless system like Git. Hence you might just consider > > > setting up a policy for your developers to communicate their > > > efforts and not step on each one's toes. > > > > > i just need to lock the file only when i work on it. so when someone > > else try to change the file that im currently working on it he wont > > be able to > > I'm not sure you understood what I written in my previous mail. > Everybody familiar with VCS does understand what locking is all about > and how it's supposed to work. > > P.S. > Please don't top post -- this breaks the discussion flow. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > As Konstantin said, Git doesn't work with lock. However, Git allows multiple developers to work in the same project. Git will merge files that have been modified by more than one developer at same time and it will be automatically if the region modified is different. Only if the region modified is the same, you will need to perform a manual merge. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] File modified after git clone
What is your operating system? Maybe it is the EOL character. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Feb 26, 2013 at 11:31 PM, José Guilherme Vanz < guilherme@gmail.com> wrote: > After clone a github repository in my PC, a file is showing like a > modified file. But the last modification in this file was done 8 months > ago. How is possible? I tried execute "git checkout -- ." but the file > continues like a modified file. > > Anybody have a tip/solution for the problem? > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] To know the string in which branch
You can use "git grep string branch" to check if the string exists in the branch. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Thu, Feb 21, 2013 at 4:35 AM, lei yang wrote: > Hi expert, > > Is there a git command to know string "foo" contains in which branch? > > Lei > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Work with two repositories
You can add several remote repositories in git using the command "git remote add ". Then, when you want to push or pull from a specific remote repository just use the alias that you used: git push master, for example. When you clone the repository from a specific url, this will be named origin, So you only need to add the other remote repository. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Feb 8, 2013 at 7:53 PM, wrote: > Hi, > > > I am new to Git. > > I want to be able to work with my main repository that has a fixed origin > and at the same time want to be able to pull and push from a different > repository. > > A typical use case would be a company that has local developers using the > repository of the company, and an outsourcing company that has its own > repository. > > The local developer has access to both repositories. > > Can you tell me what are the steps needed to get this setup? > > A link explaining that in detail would help too. > > > Thank you > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] when or which commit delete this file
After a little research, I found that you can use 'git whatchanged -- file-with-path' to look all commits that modified a file, including deleting it. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Fri, Feb 1, 2013 at 2:02 AM, William Seiti Mizuta < william.miz...@gmail.com> wrote: > I don't know if there is a better way to do it, but I use git whatchanged > to list the files modified in each commit. Then I search for the file I am > looking for. > > > William Seiti Mizuta > @williammizuta > Desenvolvedor da Caelum > > > On Fri, Feb 1, 2013 at 12:56 AM, lei yang wrote: > >> Hi experts, >> >> I have a file named foo.c, which is in tree, not I find it's removed, how >> could I which commit delete it ? >> >> >> Lei >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Git for human beings" group. >> To unsubscribe from this group and stop receiving emails from it, send an >> email to git-users+unsubscr...@googlegroups.com. >> For more options, visit https://groups.google.com/groups/opt_out. >> >> >> > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] when or which commit delete this file
I don't know if there is a better way to do it, but I use git whatchanged to list the files modified in each commit. Then I search for the file I am looking for. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Fri, Feb 1, 2013 at 12:56 AM, lei yang wrote: > Hi experts, > > I have a file named foo.c, which is in tree, not I find it's removed, how > could I which commit delete it ? > > > Lei > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. > > > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] How to apply a commit present inthe history on the HEAD
If you want to apply the commit in the same branch, ie, just change the commit order, you can use git rebase -i. You just need to pass the hash of the commit before the one you want to change and change the order of the commits in the text editor that are showed to you when you use the command. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Thu, Jan 17, 2013 at 5:36 PM, wrote: > Hi, > > 1. I am trying to apply a commit which was done a while back on the HEAD. > > git log --oneline shows the following and lets say I want to apply the > commit 2618b13 on the HEAD. > 2617b13 > 2614b13 > 2611b13 > 2618b13 > 2618b13 --> I want to apply this change on the HEAD > > I am trying the following command but > 1.git format-patch 2618b13f479b45f49ee08ffb2203d875882dea3e^.. > 2618b13f479b45f49ee08ffb2203d875882dea3e > creates a patch cleanly > > 2.Now I want to apply this patch am using patch -p1 > 0001-Update-Android.mk-to-only-support-Open-Source-builds.patch,it gets > stuck > > How to proceed..are there any other options to do the above? > > -- > > > --
Re: [git-users] Delete sub-folder in GIT
Use git status to verify the directory status. If the directory is under "Untracked files", you can simply delete the directory like any other files in your pc. William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Wed, Jan 16, 2013 at 10:57 AM, Victoria wrote: > Hello, > > Complete beginner here! > > I installed Git, the other day, and in the process of learning how to work > with the commands I forked a "repo" to an already existing one as a sub > folder, what I really wanted to do was have it as an independent folder, I > do not know how to revert this or delete the sub folder so that I can do > the process properly again. > > I had made some research; used "git rm" to remove files in the sub > folder, so that its empty, but I am doubtful that this is the proper way to > do it, to be honest I really have no clue at the moment. > > Much appreciation to anyone that replies, > > Thanks. > > -- > > > --
Re: [git-users] git grief
Try to do a git fetch and post the result of the commands git status and git diff --stat master origin/master William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Tue, Jan 15, 2013 at 10:07 PM, JavaSrvcs wrote: > I have not changed any code and just tried to do a git pull and get the > following message: > > Updating 527f1ee..18cf73e > error: Your local changes to the following files would be overwritten by > merge: > java//Info.java > Please, commit your changes or stash them before you can merge. > Aborting > -- > > > I HAVE NOT CHANGED THIS FILE. It is telling me that my local changes > huh? I have not changed or modified the file. > > > When I do a $git status I see a lot of other files that begin with: > > *# modified: /Some.java* > > > > How do I get out of this mess? I do not want to reset head. I want to > get back to the state where it does not think I have modified a specific > set of files... namely the files that I did not change. > > > How did I get into this state? How do I prevent from getting into this > state in the future? How do I get out of this state now? > > > thanks for all the help. > > J.V. > > -- > > > --
