[git-users] Re: Revert To Before A Specific Patch....
On Apr 1, 2:51 am, Jeffda wrote: > It would be awesome if GIT would have the capability to revert/reset > to a specific date/time. Read the manual of the git-reset command (and its "--hard" command- line option in particular), read the manual of the git-rev-parse command and its "SPECIFYING REVISIONS" section in particular. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Revert To Before A Specific Patch....
Thanks all! It would be awesome if GIT would have the capability to revert/reset to a specific date/time. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] How to exclude branches from git push?
On 31/03/10 vfclists said: > When I run 'git remote show origin' the output states that a git push/ > pull/fetch will fetch and push a number of branches on the remote. > > Is there a way to push only a particular branch and ignore the others? Yup. git push myremote mylocalbranch:myremotebranch Mike pgp3omoog2D1q.pgp Description: PGP signature
[git-users] Re: How do you exclude files from being merged by git pull, push etc?
On Mar 31, 6:07 pm, vfclists wrote: [...] > So after creating branch, how do I configure it to exclude some files > from being merged or updated from the mainline version. In other words > it will be akin to having the working directory made up files from 2 > or more branches in the remote repositories, and pushes and pulls will > know which files goes where or comes from. [...] Possibly you should look at submodules [1] and subtree merging [2]. 1. http://progit.org/book/ch6-6.html 2. http://progit.org/book/ch6-7.html -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: How to exclude branches from git push?
On Mar 31, 11:31 pm, vfclists wrote: > When I run 'git remote show origin' the output states that a git push/ > pull/fetch will fetch and push a number of branches on the remote. > > Is there a way to push only a particular branch and ignore the others? Yes, see the git-config manual and search for the "push.default" option. > The git branch docs show this example. > *** > Delete an unneeded branch > > $ git clone git://git.kernel.org/.../git.git my.git > $ cd my.git > $ git branch -d -r origin/todo origin/html origin/man (1) > *** > > Does the 'git branch -d -r' option delete the local copies of the > remote branches, or the remote copies? > > If I were to apply them without the origin prefix would it delete just > the local ones? "Yes" to both questions. Note that "origin" is not prefix, it's the name of an actual directory under .git. To get a better grasp of this topic, read the "SPECIFYING REVISIONS" section of the git-rev-parse manual page. Also I'd like to amend what Marek said: I noticed people get confused by the convention used to delete objects in remote repositories (that `git push remote_name :remote_object` thing). The idea is that in the "full" form used for pushing rather than deletion you use this command like this: $ git push remote_name local_object:remote_object and so for deletion you push "nothing" to a specific remote object. Thinking this way possibly gives the "deletion" form of this command more sense. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Revert To Before A Specific Patch....
On Mar 31, 10:33 pm, Jeffda wrote: > Is it possible to revert a GIT repository to what it was right before > a specific patch was applied? If so, is it possible to do so with just > the patch's filename or the patch itself? Alternatively (to what Marek discussed), as you mention patches, you can use the "patch" command itself to revert a specific patch using its "-R" command-line option. That is, if you applied a patch foo.patch $ patch -p1 http://groups.google.com/group/git-users?hl=en.
[git-users] Re: How to exclude branches from git push?
On 31 Mar, 21:31, vfclists wrote: > When I run 'git remote show origin' the output states that a git push/ > pull/fetch will fetch and push a number of branches on the remote. > > Is there a way to push only a particular branch and ignore the others? > > The git branch docs show this example. > *** > Delete an unneeded branch > > $ git clone git://git.kernel.org/.../git.git my.git > $ cd my.git > $ git branch -d -r origin/todo origin/html origin/man (1) > *** > > Does the 'git branch -d -r' option delete the local copies of the > remote branches, or the remote copies? > > If I were to apply them without the origin prefix would it delete just > the local ones? to remove branch you can run: * git branch -d localname # to remove local branch * git push origin :localname # to remove localname from origin same way you can remove tags: * git tag -d sometag # local remove * git push origin :sometag # to remove tag in origin -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Revert To Before A Specific Patch....
On 31 Mar, 20:33, Jeffda wrote: > Is it possible to revert a GIT repository to what it was right before > a specific patch was applied? If so, is it possible to do so with just > the patch's filename or the patch itself? You can run: * git reset --soft commitid to move HEAD to commitid and commits after commitid to stage (waiting for commit) or: * git reset --hard commitid to move HEAD to commitid and discard commits after commitid -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] How to exclude branches from git push?
When I run 'git remote show origin' the output states that a git push/ pull/fetch will fetch and push a number of branches on the remote. Is there a way to push only a particular branch and ignore the others? The git branch docs show this example. *** Delete an unneeded branch $ git clone git://git.kernel.org/.../git.git my.git $ cd my.git $ git branch -d -r origin/todo origin/html origin/man (1) *** Does the 'git branch -d -r' option delete the local copies of the remote branches, or the remote copies? If I were to apply them without the origin prefix would it delete just the local ones? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Revert To Before A Specific Patch....
Is it possible to revert a GIT repository to what it was right before a specific patch was applied? If so, is it possible to do so with just the patch's filename or the patch itself? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: How do you exclude files from being merged by git pull, push etc?
On Wed, Mar 31, 2010 at 2:08 PM, vfclists wrote: > > > On Mar 31, 6:03 pm, Rick DeNatale wrote: >> On Wed, Mar 31, 2010 at 12:11 PM, vfclists wrote: >> >> > On Mar 31, 4:20 pm, Rick DeNatale wrote: >> >> Is this what you are looking for? >> >> >>http://www.gitready.com/beginner/2009/01/19/ignoring-files.html >> >> > Using .gitignore is something I have considered, but it looks like it >> > is going to get more interesting than that. >> > I will probably have to use separate directories, and use some kind of >> > condititional excludes or includes if .gitignore supports something >> > like that. >> >> > Does checking out a branch erase all the directories and files in the >> > working directory and replace them with only the contents of the >> > branch? >> >> Only files which are tracked will be affected by a checkout. >> >> Files don't get tracked until you git add them. >> >> .gitignore is a way to keep new files from being tracked. >> > > Does this mean that if you checkout a branch, only files that you add > are committed, even if in the original branch they are still tracked? > That will be a new discovery for me if that is the way git works. Okay, note I have gs as an alias for 'git status', and gc as an alias for 'git commit' → mkdir gitexample → cd gitexample ~/gitexample → git init Initialized empty Git repository in /Users/rick/gitexample/.git/ ~/gitexample [git:master] → gs # On branch master # # Initial commit # nothing to commit (create/copy files and use "git add" to track) ~/gitexample [git:master] → echo "hello" > file1.txt ~/gitexample [git:master] → gs # On branch master # # Initial commit # # Untracked files: # (use "git add ..." to include in what will be committed) # # file1.txt nothing added to commit but untracked files present (use "git add" to track) ~/gitexample [git:master] → git add file1.txt ~/gitexample [git:master] → gs # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached ..." to unstage) # # new file: file1.txt # ~/gitexample [git:master] → gc -m'first commit' [master (root-commit) 7997c23] first commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 file1.txt ~/gitexample [git:master] → gs # On branch master nothing to commit (working directory clean) ~/gitexample [git:master] → gs # On branch master nothing to commit (working directory clean) ~/gitexample [git:master] → echo " world" >> file1.txt ~/gitexample [git:master] → gs # On branch master # Changed but not updated: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: file1.txt # no changes added to commit (use "git add" and/or "git commit -a") So even tracked files which are changed don't get commited unless you add them. But there is an option (-a or --all) on git commit which will add tracked files in the process of committing. It's not uncommon to get into the habit of using this, which is why .gitignore is useful since git commit -a won't pick up files which are ignored. There are also options to interactively determine at commit time which files to commit, but I won't go into that here. -- Rick DeNatale Blog: http://talklikeaduck.denhaven2.com/ Twitter: http://twitter.com/RickDeNatale WWR: http://www.workingwithrails.com/person/9021-rick-denatale LinkedIn: http://www.linkedin.com/in/rickdenatale -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: How do you exclude files from being merged by git pull, push etc?
On Mar 31, 6:03 pm, Rick DeNatale wrote: > On Wed, Mar 31, 2010 at 12:11 PM, vfclists wrote: > > > On Mar 31, 4:20 pm, Rick DeNatale wrote: > >> Is this what you are looking for? > > >>http://www.gitready.com/beginner/2009/01/19/ignoring-files.html > > > Using .gitignore is something I have considered, but it looks like it > > is going to get more interesting than that. > > I will probably have to use separate directories, and use some kind of > > condititional excludes or includes if .gitignore supports something > > like that. > > > Does checking out a branch erase all the directories and files in the > > working directory and replace them with only the contents of the > > branch? > > Only files which are tracked will be affected by a checkout. > > Files don't get tracked until you git add them. > > .gitignore is a way to keep new files from being tracked. > Does this mean that if you checkout a branch, only files that you add are committed, even if in the original branch they are still tracked? That will be a new discovery for me if that is the way git works. It will make things a lot easier for me it it works that way. I could remove all the files and add only the ones I need to change. > -- > Rick DeNatale > > Blog:http://talklikeaduck.denhaven2.com/ > Twitter:http://twitter.com/RickDeNatale > WWR:http://www.workingwithrails.com/person/9021-rick-denatale > LinkedIn:http://www.linkedin.com/in/rickdenatale -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Re: How do you exclude files from being merged by git pull, push etc?
On Wed, Mar 31, 2010 at 12:11 PM, vfclists wrote: > > > On Mar 31, 4:20 pm, Rick DeNatale wrote: >> Is this what you are looking for? >> >> http://www.gitready.com/beginner/2009/01/19/ignoring-files.html >> >> > > > Using .gitignore is something I have considered, but it looks like it > is going to get more interesting than that. > I will probably have to use separate directories, and use some kind of > condititional excludes or includes if .gitignore supports something > like that. > > Does checking out a branch erase all the directories and files in the > working directory and replace them with only the contents of the > branch? Only files which are tracked will be affected by a checkout. Files don't get tracked until you git add them. .gitignore is a way to keep new files from being tracked. -- Rick DeNatale Blog: http://talklikeaduck.denhaven2.com/ Twitter: http://twitter.com/RickDeNatale WWR: http://www.workingwithrails.com/person/9021-rick-denatale LinkedIn: http://www.linkedin.com/in/rickdenatale -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: How do you exclude files from being merged by git pull, push etc?
On Mar 31, 4:20 pm, Rick DeNatale wrote: > Is this what you are looking for? > > http://www.gitready.com/beginner/2009/01/19/ignoring-files.html > > Using .gitignore is something I have considered, but it looks like it is going to get more interesting than that. I will probably have to use separate directories, and use some kind of condititional excludes or includes if .gitignore supports something like that. Does checking out a branch erase all the directories and files in the working directory and replace them with only the contents of the branch? If my project files placed customized files in one directory and common files in another, and checking out from different branches did not override those directories I think that would help. > > On Wed, Mar 31, 2010 at 10:07 AM, vfclists wrote: > > > I have come to one of my main reasons for using git. > > > I am creating an app which is being customzied for users. > > > The idea is that the main non UI code is constant, the same across all > > customized versions, but with the customized versions, the UI will > > will different, some options will be disabled etc, and some of the > > functions in the non UI libraries will never be called at all, > > although they will be there for consistency's sake. > > > So after creating branch, how do I configure it to exclude some files > > from being merged or updated from the mainline version. In other words > > it will be akin to having the working directory made up files from 2 > > or more branches in the remote repositories, and pushes and pulls will > > know which files goes where or comes from. > > > I am sure git probably allows this in its feature set, but I am yet to > > know the right configuration. > > > -- > > You received this message because you are subscribed to the Google Groups > > "Git for human beings" group. > > To post to this group, send email to git-us...@googlegroups.com. > > To unsubscribe from this group, send email to > > git-users+unsubscr...@googlegroups.com. > > For more options, visit this group > > athttp://groups.google.com/group/git-users?hl=en. > > -- > Rick DeNatale > > Blog:http://talklikeaduck.denhaven2.com/ > Twitter:http://twitter.com/RickDeNatale > WWR:http://www.workingwithrails.com/person/9021-rick-denatale > LinkedIn:http://www.linkedin.com/in/rickdenatale -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Does git have some kind of logging or verbose format?
On Mar 31, 5:25 pm, vfclists wrote: [...] > > When I try you suggestion, a message suggesting it is using plink to > > connect, yet the ssh command works fine. > > When I try to generate a key it also complains that the id_rsa file > > already exists. It looks like although it was through Git I set up the > > ssh key, it is expecting the file to be converted for use with plink > > before it works. > > I think I will create a putty connection for the username/server and > > get the key converted and stored in it. That might work. > > Creating a putty session with for the git user on the server, saving > the user name and adding the ppk to it solved the problem. It looks > like TortoiseGit uses the id_rsa key, where as msysGit doesn't, as it > probably expects a putty session with a username and saved .ppk key to > already exist for use by plink. I think the truth is that msysgit can be configured in different ways while being set up. As I extensively use putty for conrolling my Linux machines, I did not explore the other means msysgit can use to talk with the servers. You might find it useful to try another approach to msysgit+plink: putty comes with a tool called "pageant" which is a SSH agent, that is, you supply it with one or more private SSH keys, it asks for passphrases for them and caches these passphrases. So I use it like this: after logging in, I start a script which spawns pageant with my ppk key, enter the password and then pageant just sits in the tray. Whenever I talk to a sevrer, plink picks the (decrypted) key from pageant and logs to the server using it. This is hence convenient as I only have to type my passphrase once per (windows) session. I find it more usable than creating a specialized session in putty with a key attached. Also I think it worth noting that TortoiseGit is a project completely separated from msysgit; instead, msysgit folks are working on their own shell-integrated extension called Git Cheetah (it also integrates to Nautilus on GNOME desktop). Its development appeared to be stagnated for some time, but the latest preview bundle of msysgit includes its working version, so you could try it out -- may be it integrates more nicely with msysgit. In any case, both msysgit and tortoisegit communities have their own mailing lists -- if you have any issues with these pieces of software, it's probably more appropriate to direct such kind of questions there. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] How do you exclude files from being merged by git pull, push etc?
Is this what you are looking for? http://www.gitready.com/beginner/2009/01/19/ignoring-files.html On Wed, Mar 31, 2010 at 10:07 AM, vfclists wrote: > > I have come to one of my main reasons for using git. > > I am creating an app which is being customzied for users. > > The idea is that the main non UI code is constant, the same across all > customized versions, but with the customized versions, the UI will > will different, some options will be disabled etc, and some of the > functions in the non UI libraries will never be called at all, > although they will be there for consistency's sake. > > So after creating branch, how do I configure it to exclude some files > from being merged or updated from the mainline version. In other words > it will be akin to having the working directory made up files from 2 > or more branches in the remote repositories, and pushes and pulls will > know which files goes where or comes from. > > I am sure git probably allows this in its feature set, but I am yet to > know the right configuration. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To post to this group, send email to git-us...@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > > -- Rick DeNatale Blog: http://talklikeaduck.denhaven2.com/ Twitter: http://twitter.com/RickDeNatale WWR: http://www.workingwithrails.com/person/9021-rick-denatale LinkedIn: http://www.linkedin.com/in/rickdenatale -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] How do you exclude files from being merged by git pull, push etc?
I have come to one of my main reasons for using git. I am creating an app which is being customzied for users. The idea is that the main non UI code is constant, the same across all customized versions, but with the customized versions, the UI will will different, some options will be disabled etc, and some of the functions in the non UI libraries will never be called at all, although they will be there for consistency's sake. So after creating branch, how do I configure it to exclude some files from being merged or updated from the mainline version. In other words it will be akin to having the working directory made up files from 2 or more branches in the remote repositories, and pushes and pulls will know which files goes where or comes from. I am sure git probably allows this in its feature set, but I am yet to know the right configuration. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: Does git have some kind of logging or verbose format?
On Mar 27, 12:05 am, vfclists wrote: > On Mar 26, 5:38 pm, Konstantin Khomoutov wrote: > > > > > On Mar 22, 4:57 pm, vfclists wrote: > > > > > > I keep getting > > > > > Fatal: The remote end hung up unexpectedly > > > > > and would like to know if there is a way to get git to give more > > > > > detail on what is going run, like some verbosity level both on the > > > > > server as well as locally, > > [...] > > > My system consists of msysgit and TortoiseGit. > > > I setup the key using msysgit's ssh-keygen and Tortoise is able to > > > work with it fine. > > > I am not using the putty/plink system with msysgit. > > > [...] > > All output seems OK to me so I don't really know what to do next as I > > use putty suite myself. > > One thing which could probably shed some light on your issue is to > > enable "git tracing" before trying the offending command; try > > something like this: > > > C:\repo> set GIT_TRACE=1 > > C:\repo> git remote show origin > > > And see what it prints. > > When I try you suggestion, a message suggesting it is using plink to > connect, yet the ssh command works fine. > When I try to generate a key it also complains that the id_rsa file > already exists. It looks like although it was through Git I set up the > ssh key, it is expecting the file to be converted for use with plink > before it works. > > I think I will create a putty connection for the username/server and > get the key converted and stored in it. That might work. Creating a putty session with for the git user on the server, saving the user name and adding the ppk to it solved the problem. It looks like TortoiseGit uses the id_rsa key, where as msysGit doesn't, as it probably expects a putty session with a username and saved .ppk key to already exist for use by plink. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
