[git-users] Re: Word wrap in Terminal
On Aug 17, 12:13 am, Roddie Grant wrote: > This is one of those things that should be obvious, but I'm blowed if I can > find it. > > When I use git log in Terminal on my Mac there is no word wrap, so I only > get partial commit messages thus (deliberately exaggerated because of email > word wrap!): > > > commit 1db86a46bd5791bb8e11322edfcb6d286bb6b633 > > Author: Roddie > > Date: Mon Aug 16 17:14:21 2010 +0100 > > > References to $fundingLevel "funded" replaced with "partfunded" an > > > The green stripe needs to know the bucket's funding level to calcu > > > "partfunded" only applies to multiple buckets - when at least one > > How do I get to see complete paragraphs in commit messages? I'm not a mac user, but I have some experience with posix systems from which mac drawn this bit of functionality, so the question: does the output of git-log go straight to the terminal or is it piped to some sort of "pager" program like "more" or "less"? In the former case you should check Terminal's settings (google for "Mac+Terminal+word+wrap"), in the latter case you should check the pager's settings. Less, for instance, has the "chop long lines" option (also available interactively, as the "-S" literal key sequence toggle); you can set this option permanently by adding "-S" to the contents of the "LESS" environment variable. -- 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] Word wrap in Terminal
This is one of those things that should be obvious, but I'm blowed if I can find it. When I use git log in Terminal on my Mac there is no word wrap, so I only get partial commit messages thus (deliberately exaggerated because of email word wrap!): > commit 1db86a46bd5791bb8e11322edfcb6d286bb6b633 > Author: Roddie > Date: Mon Aug 16 17:14:21 2010 +0100 > > References to $fundingLevel "funded" replaced with "partfunded" an > > The green stripe needs to know the bucket's funding level to calcu > > "partfunded" only applies to multiple buckets - when at least one How do I get to see complete paragraphs in commit messages? Thanks Roddie Grant -- 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] Checking out a branch
On Aug 16, 2010, at 10:16 AM, David Doria wrote: > It seems like it creates a NEW branch because I get That's really what you want though. You can think of the remotes/origin/VTK-GraphConversions branch, as your local mirror of the remote branch. You will never commit to it directly because then it wouldn't mirror the remote server. That's why git puts you on a "detached head" when you try to check it out. So what you really want to do is create a local branch that is linked to the remote branch, that you can then commit to and push back upstream. See my previous email about how to ensure you get the upstream configuration set up using the --track option. dan -- 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] Checking out a branch
> git checkout -b VTK-GraphConversions origin/VTK-GraphConversions I don't believe that will setup the upstream configuration. If you will usually be pushing and pulling from this remote branch, you may want to use the --track option. If you use the --track option, you can also omit the -b option and it will derive the name of the new branch from the remote name. git checkout --track origin/VTK-GraphConversions Alternatively if you feel you will be doing this a lot, you can git config the branch.autosetupmerge option. If you are also going to be creating new branches and publishing them upstream, you may want to look into the git-publish-branch tool over at http://git-wt-commit.rubyforge.org. It's a nice intuitive shortcut. dan On Aug 16, 2010, at 10:18 AM, Michael P. Soulier wrote: > David Doria wrote: > >> git checkout remotes/origin/VTK-GraphConversions > > Don't check out remote branches, create your own based on them. > > git checkout -b VTK-GraphConversions origin/VTK-GraphConversions > > Mike > -- 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: Checking out a branch
Hi Michael, Thanks for the quick response. Are you saying that is the "recommended" thing to do? Or is that the "only" thing to do (i.e. is it possible to do what I had said?) Thanks, David On Aug 16, 1:18 pm, "Michael P. Soulier" wrote: > David Doria wrote: > > git checkout remotes/origin/VTK-GraphConversions > > Don't check out remote branches, create your own based on them. > > git checkout -b VTK-GraphConversions origin/VTK-GraphConversions > > Mike > > signature.asc > < 1KViewDownload -- 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] Checking out a branch
David Doria wrote: > git checkout remotes/origin/VTK-GraphConversions Don't check out remote branches, create your own based on them. git checkout -b VTK-GraphConversions origin/VTK-GraphConversions Mike signature.asc Description: OpenPGP digital signature
[git-users] Checking out a branch
First, I clone my github repo: git clone g...@github.com:daviddoria/daviddoria-vtk.git Then I want to work on a particular branch (there are several - you can see them here: http://github.com/daviddoria/daviddoria-vtk) If I 'git branch -a' I see: [dor...@doriadjec VTK-GraphIterators]$ git branch -a VTK-daviddoria remotes/origin/HEAD -> origin/VTK-daviddoria remotes/origin/VTK-AllProjects remotes/origin/VTK-GraphConversions etc Then if I git checkout remotes/origin/VTK-GraphConversions it says that I am on a detached HEAD If I instead do git checkout -b VTK-GraphConversions remotes/origin/VTK- GraphConversions It seems like it creates a NEW branch because I get $ git branch -a * VTK-GraphConversions VTK-daviddoria remotes/origin/VTK-GraphConversions How should I begin working on a branch after I clone the repo? Thanks! David -- 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] Git pull shows merge conflicts, git mergetool shows none
Hi Can someone explain how a 'git pull' can result in an auto-merge conflict, thus be left with a manual merge to be done, 'git status' showing 'unmerged' files as a result and still have 'git mergetool' show 'No files to be merged' ? That's the second time I encounter this - sometimes git-mergetool works, sometimes it just reports nothing to be merged, and I don't understand why. Thanks -- 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.
