[git-users] Re: svn remove branch not passed through to git

Yes, this is true. By default, you'll get a lot of stale branches in your fetching repo. For the time being, I've ignored this. I regularly clean it up. Say I have a mirror of a svn repo with trunk, tags/1.0 and a branch branches/1.0.x: Fetching repo: tfnico:~/git-repos/website-fetching/>git br

[git-users] Re: dcommit with conflict

Just for orientation, me and Sabba are sparring about how to setup and use a Git-SVN mirror. More details (explaining 'upci' and more) can be found here: http://blog.tfnico.com/2010/11/git-svn-mirror-for-multiple-branches.html On Wednesday, March 30, 2011 12:25:50 AM UTC+2, Sabba Hillel wrote:

[git-users] Re: dcommit with conflict

"Someone else does a commit to the svn repository of a change to README.txt" Is the above commit properly rebased into your local repository before you do the upci? Also, try again to do the manual git update-ref and git svn dcommit instead of using the "upci" alias. Could be that there is some

[git-users] Re: git pull whithout download all file

I think the easiest way would be to run instaweb in the git repository, and then get the file you want via http/wget. More info here: https://git.wiki.kernel.org/index.php/Gitweb -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post

[git-users] Re: dcommit with conflict

You are right with one clarification: The svn repository must be set up to trigger a rebase in the fetching repository upon committing. I've found the best way to do this is to have a svn post-commit hook that triggers a job that does this (git svn rebase/fetch + push to bare repo). It is also

[git-users] Re: dcommit with conflict

No problem, that's what this mailing list is here for. I hope you're successful with your conversion. That's what it's all about in the end! :) -- 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

[git-users] Re: Odd performance problem with git diff

Yay! These .svn folders are causing havoc to our workspace in general. Amazing how much they slow it down. Another good reason to switch to git :) -- 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-

[git-users] Re: Git on Android

Wow, that sounds ambitious :) Personally, I don't have an Android device, and I imagine if I did, I probably wouldn't use it much for development, hence I wouldn't need Git support on it (I would probably use DropBox for storing files and stuff). Maybe, if I had larger tablet, it would be inter

Re: [git-users] Subdirectories and Continuous Integration

I would go for splitting them into 7 isolated projects. In my experience, the advantages of this isolation greatly outweighs advantages of keeping them in one place, regardless of what SCM you are using. You want CruiseControl to build the 7 different apps as 7 different projects. If this is pr

[git-users] Re: error "squash commits first" when git push

Hi Carter, It's a bit hard to understand what you are doing here. Please write exactly what you commands you are doing and the console output you are getting as a result. Generally, squashing means rewriting several old commits into being a single commit. It is "general Git knowledge" that you

[git-users] Re: Git enterprise setup on a large project

Hi Fred, I think there are many of us with experiences from old setups where SCM was just used wrong :) Although your idea sounds possible, I'm not sure if it would be good for an enterprise setup. It kind of sounds like an internal open-source project, where the project leader accepts patches

Re: [git-users] git read-tree failure

I'm not really familiar with the read-tree command, nor have I had any use for it the last year of using git :) I think read-tree is more of a lower level "plumbing" command that normally we do not have so much need for. Maybe you can explain us what you really want to achieve? -- You receive

[git-users] Re: Git enterprise setup on a large project

Looking forward to it. Good luck with your setup! -- 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-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googl

[git-users] Re: Fwd: Available consultant's for your requirement.

And not a single Git consultant. Tsk, tsk! Akshay Korgaonkar wrote: > -- Forwarded message -- > From: Akshay Korgaonkar > Date: Wed, Apr 6, 2011 at 12:23 AM > Subject: Available consultant's for your requirement. > To: recruiter.aks...@gmail.com > > > HI, > > > > Mentioned below

[git-users] Re: Cannot compute Git history.

Hi, In the future, please paste in the exact git commands and outputs from git as they appear in the console. The only thing I can find related to this "missing tree" message is this StackOverflow post: http://stackoverflow.com/questions/1507463/how-to-deal-with-this-git-error Maybe you can t

[git-users] Re: How to manage branches of submodules without publishing those branches to the submodule origins?

I'm not sure there are so many Drupal users frequenting this list.. Anyhow, I'm sure there are someone who can suggest something. It's just that your mails are a bit long, and I haven't quite gotten around to read them through yet :) -- You received this message because you are subscribed to t

[git-users] Re: Interactive rebase and using date of the most recent commit

A commit has a date. When you squash one commit into the previous commit, it keeps the date of the commit you are squashing into. Makes sense. You could maybe reset a previous commit, and then manually amend/edit the changes into the existing commit with the date you want to keep. If you want

[git-users] Re: workflow involving lock

Hi Mikael, The short answer is: No, if you want central locking of a resource, Git is not for you. Longer answer: http://stackoverflow.com/questions/119444/locking-binary-files-using-git-version-control-system -- You received this message because you are subscribed to the Google Groups "Git

[git-users] Re: Optimal Git setup for multiple websites

Hi Carey, welcome to the wonderful world of Git ;) So, you've got some server machines: * UK machine * US machine * local machine You've got basically one repo called "website". This repository will get cloned across each of these three machines. Now don't confuse these repositories with the

[git-users] Re: slowness pulling data to mobile devices

It sounds like your repository contains a lot of binary files. As you may know, Git is designed to be very efficient and fast while working with source code (pure text files). Of course it scales up pretty well dealing with binary files as well, but it's not meant to be a syncing-mechanism for

[git-users] Re: Optimal Git setup for multiple websites

Yes, if it's two different websites, there's no point in them sharing a repository. Have two repositories: website-us and website-uk. There's nothing wrong with having more machines involved, of course. You can clone around the repository as many times as you want. But before a developer in Haw

Re: [git-users] Re: slowness pulling data to mobile devices

If it's only for backup or transport purposes, you could still rsync the repository to your mobile. Making it a bare repository would reduce the size of stuff to be rsynced. I'm not familiar with the internals of a git push or pull, but there is a lot of cons

[git-users] Re: Optimal Git setup for multiple websites

Oh, I didn't spot the difference there. Hmm. Well, you can have an intermediate intermediate repository if you want. This is a nice place for sharing branches and stuff between developers. If you have it push onward to the webserver automatically or if you have the developers push themselves..

[git-users] Re: Merge went wrong?

382ac64207cf6fe812c5da51577016 Merge: e704b91 72065c6 Author: Thomas Ferris Nicolaisen Date: Thu Apr 28 10:10:19 2011 +0200 Merge branch 'bar' into funk Conflicts: src/business/validation/src/test/java/org/hbird/business/validation/UpperLowerCountTest.java diff -

[git-users] Re: Merge went wrong?

When it comes to resolving the "problem", you've got three options, I guess: 1) Leave it like it is and keep on working 2) Force a rewrite of history onto the github master branch. This will create problems for anyone who have already cloned with the latest changes 3) Abandon the master branch an

[git-users] Re: Local merges from continuous integration

Hi Barry, Do you know exactly how CruiseControl updates the repository (pulls)? Can you paste the .git/config from the CruiseControl repo? -- 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-users@g

[git-users] Re: Merge went wrong?

Hm, that could be. If you can reproduce the problem, maybe this is a bug in EGit that should be reported.. My local EGit installation is a bit outdated so I can't test myself at the moment. -- You received this message because you are subscribed to the Google Groups "Git for human beings" gro

[git-users] Aw: Re: When subproject is a subtree merge, how do I revert to a previous version?

Maybe this is a bit too challenging for us :) Try the main git list: http://vger.kernel.org/vger-lists.html#git -- 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-users@googlegroups.com. To unsubscr

[git-users] Aw: which release (non-beta) to download for windows?

I think the closest you can get to an official release is the one linked to on http://git-scm.com/ Which at the moment is... Git-1.7.4-preview20110204.exe - Full installer for official Git 1.7.4 T

[git-users] Re: Local merges from continuous integration

I think it sounds a bit unintuitive that you manually created CruiseControl's working copy repository, but at the same time you didn't author how CruiseControl pulls updates. Anyhows, I have little knowledge of how CruiseControl works with Git. Perhaps you should rather try their support forums

[git-users] Re: error: could not lock config file /path/to/file/.gitconfig

Hi Juliano, That is not an error message, that's the config command. Maybe you pasted the wrong line? -- 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-users@googlegroups.com. To unsubscribe from

Re: [git-users] Re: error: could not lock config file /path/to/file/.gitconfig

Ah, silly me. Maybe also post which version of Git you are using, and whether you're on windows. You can also just jump around the problem and just edit the .gitconfig file manually: [user] name = You Name email = y...@email.com -- You received this message because you are subscribe

[git-users] Re: Unable to push remote branches

Hi, Try experimenting with a refspec like this: git push origin refs/remotes/*:refs/remotes/* See the section in git pushfor more info. -- You received this message because you are subscribed to the Google Groups "Git for human

[git-users] Re: Local site running on webbrick has no data

Hi Bill, It's a bit hard to understand what you're problem is. You say it's a DB issue, but this mailing list has little to do with neither databases nor WEBrick. I googled a bit and found that WEBRick is included in the Ruby on Rails project. Perhaps you should try asking for help at their f

[git-users] Re: Pushing new VIEW code to production not showing in browser

Hi Bill, I'm assuming this is another WEBrick problem. Please see my other mail for advice ;) -- 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-users@googlegroups.com. To unsubscribe from this grou

[git-users] Re: deleted local changes via checkout

Hi Thorolf, I'm afraid you've fallen out of Git's "mercy" by not adding these changes to the index, or stashing them. Local changes are not specific for any branch, so to speak. They don't "stick" to the branch you're in before you commit. By adding your files to the index, Git will not overwri

[git-users] Aw: Re: deleted local changes via checkout

Erm, don't forget to commit as well! That's even safer than adding :) -- 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-users@googlegroups.com. To unsubscribe from this group, send email to git-use

[git-users] Re: How to install git-svn from source?

You don't need to build git from source. There are plenty of ready binaries around. Just pick your platform in http://git-scm.com/download As far as I know, git-svn are included in most binaries. If you still have problems, let us know which platform you're on (Windows, Linux or OS X). If you

[git-users] Re: How to install git-svn from source?

Hm, well this is a bit beyond me, I'm afraid. You could try asking at the main Git list: http://vger.kernel.org/vger-lists.html#git -- 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-users@googleg

[git-users] Re: git-svn - doesn't quite match svn head?

git clean -df There are a number of options in git that have to do with empty directories. Have a look at http://www.kernel.org/pub/software/scm/git/docs/git-svn.html and search for "empty dir". -- You received this message because you are subscribed to the Google Groups "Git for human being

[git-users] Re: how merge a branch in an empty head

Not quite sure what you're trying to do here, but usually there is no point in merging into an empty branch. Rather, just create the branch based on the other branch: git branch master origin/master (sets up a branch called "master" based on the remote origin/master) -- You received this m

Aw: Re: [git-users] Won't push

Konstantin beat me to it. I suspect that 'wn' is 'webbynode '. git commit -a is synonymous to doing a commit after doing git add -u (adds all changes for files already tracked). -- You received this message because you are subscribed to the Go

[git-users] Re: -v option for git log --grep

If you want to do the equivelant of a "svn log -v", the parameter you want is --name-status I use this so often that I have an alias in my .gitconfig: alias.logv=log --name-status If you have any questions to the git developers, the place to ask is the main git mailing list

[git-users] Re: -v option for git log --grep

Ah, I see. The git developers use the mailing list for tracking issues. -- 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-users@googlegroups.com. To unsubscribe from this group, send email to git

[git-users] Aw: Submitting into SVN using Git commit entries

Hum.. I can certainly understand that this would be a useful feature. It would be kinda like a reverse authormap (git svn fetch -A). Unfortunately, git-svn doesn't support this. I can imagine how it could be implemented, using an array of prepared ~/.subversion/auth files for each author, and t

[git-users] Aw: Re: Submitting into SVN using Git commit entries

(this is a reply to your second email, my first mail was a reply to your first one) > > > > I > can see how this works and I like the idea, although what would happen if > people share code in the Git repository before subm

[git-users] Re: Submitting into SVN using Git commit entries

Oh, I almost forgot: If you are committing other people's commits back to SVN, a typical workaround is to use the the --add-author-from parameter in git-svn - this adds the original author as part of the commit message: --add-author

[git-users] Re: How can i know who deleted git branch?

Hi, It's a bit hard to give an answer without being more concrete.. Have a look at this blog post, it goes through a lot of examples on how to recover a lost branch (or commit): http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/ -- You received this

[git-users] Re: gitg web interface

Hum, well I didn't even notice this one last time I was looking through the alternatives. I was looking for some tool that was able to show side-by-side diffs. In the end we ended up installing Gerrit. We just use normal Gitweb as repo web frontend. I haven't yet found any good reasons to rep

[git-users] Re: gitg web interface

Oh, now I realized that gitg is like a desktop Git client. cgit on the other hand is a repository web frontend. These are two different animals. -- 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-

Re: [git-users] Re: gitg web interface

I think you've got a user with some bad ideas. Gerrit is for code-reviewing, accepting patches into a given branch. Yes, it can merge patches in, but it can't rebase. I would definitely not recommend Gerrit as a tool for branching, merging and rebasing. Your user just has to learn some Git, us

Re: [git-users] Subdirectories and Continuous Integration

Hi Sean, welcome to the group! I'm afraid I wasn't clear enough in my statement. I meant to split up the projects, as per CruiseControl configuration - not necessarily split the source repository. It could very well be that it's best to keep the source of the different apps in the same reposit

[git-users] Re: 'cannot create thread' doing clone or fetch

Hmm.. Is this maybe related? http://comments.gmane.org/gmane.comp.version-control.git/173793 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/cXRaZUtRb

[git-users] Re: 'cannot create thread' doing clone or fetch

Argh, of course it was. Sorry, I didn't see that you had replied to that thread already. Still, I think this subject is beyond the complexity for this "newbie" list :) -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discu

[git-users] Re: Git on Android

Oh, here we go: https://market.android.com/details?id=com.madgag.agit -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/FKnL9LSOQ1AJ. To post to this gro

[git-users] Re: Gerrit can't handle task in the queue and the CPU usage 100%

Hi, I think Gerrit is a bit outside the scope of this list. I see that you already tried twice on the Gerrit mailing list (https://groups.google.com/forum/#!forum/repo-discuss), and I doubt you'll get more help here. -- You received this message because you are subscribed to the Google Groups

[git-users] Re: problem with cherry-pick

Hi Giuseppe, I find it very hard to understand what you are trying to do. Can you maybe explain in more general terms what you are trying to achieve? "Deleting initial commits" doesn't make much sense to me, at least. What is the reason you are doing this? -- You received this message because

[git-users] Re: Checkout and reset to a particular commit using git gui

Hi, I'm not so familiar with Git GUI, but I see there is this "Browse Branch Files" command where you can explore the repository in a given branch/revision without doing anything with your working tree. Does that work for you? Also, in gitk (the log visualizer), you can right click commits and

[git-users] Aw: Problem with givt svn clone

Hi Thorsten, This is a common problem when there are colliding branch names with branch directories. You can have multiple branches sharing a prefix, and git uses directories to represent this): http://stackoverflow.com/questions/2527355/using-the-slash-character-in-git-branch-name So you alre

[git-users] Aw: Problem with givt svn clone

OK, I've found a working work-around. The git-svn documentation reads: When using multiple --branches or --tags, *git svn* does not automatically handle name collisions (for example, if two branches from different paths have the same name, or if a branch and a tag have the same name). In these

[git-users] Re: Problem with givt svn clone

Hi Thorsten, Regarding the bare repository: In my experience, it is more handy to *push* from the git-svn clone than to clone it. You can then arrange the branches in the bare repo as you want them to be, by only pushing the branches you wish to keep in the Git repository: First initialize a

[git-users] Re: Problem with givt svn clone

Regarding the missing branches, I don't know how that is. Can you add the full urls to these missing branches the way they look in the SVN repo? Do these branches still exist at HEAD revision? -- You received this message because you are subscribed to the Google Groups "Git for human beings"

[git-users] Re: Issue with migration from Subversion?

Hi Steph, Can you describe the structure of your SVN repository (how the branches are located in particular), and the exact command and parameters you used when starting git-svn? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view

Re: [git-users] Re: Issue with migration from Subversion?

On Monday, June 27, 2011 8:07:04 PM UTC+2, Steph wrote: > > I've forwarded the error part of this to the larger git mailing list, but I > have some PEBKAC issues that I'd like to hash out in a smaller forum... > > The command I used is this: > > > /usr/local/git/bin/git svn clone https://[server]

[git-users] Re: Problem with givt svn clone

Hmm, I wouldn't be happy with losing history.. Rather than focusing on the errors that were printed during cloning, if there are no missing branches any more, what is the actual problem after cloning? -- You received this message because you are subscribed to the Google Groups "Git for human

[git-users] Re: Problem with givt svn clone

Yes, git-svn leaves behind some junk that you can clean up later, like these @revision branches (probably git-svn finds these revisions interesting for some reason, maybe a move, or a copy took place at these points). What is the error that occurs as git-svn won't fetch any more? -- You receiv

[git-users] Re: Looking to auto-update a GIT local repo (on Windows Server) when bare repo on redmine is pushed to

Hi, You could just set up a scheduled task on the Windows server that checks for changes and does a pull (in a batch script). Personally, I've developed a taste for using my company's CI-system (continuous integration) for this kind of work. Think of it as a neat place to run scheduled tasks.

[git-users] Re: issue in deployment : fatal: unable to create '.git/index.lock': File exists

Hi Erwin, Finding the right branching/deployment model in Git is pretty much up to your imagination :) However, if you're not the creative type, there's a de-facto "best practice" model here: http://nvie.com/posts/a-successful-git-branching-model/ Maybe you'll find this model inspiring. Note t

[git-users] Re: issue in deployment : fatal: unable to create '.git/index.lock': File exists

Oh, by the way, the model is commonly known as "git-flow", and there's a mailing list dedicated to it: https://groups.google.com/forum/#!forum/gitflow-users And also a git-wrapper that makes it easier to use (but don't start using it before you know what's going on under the hood): https://git

[git-users] Re: fetch & merge but ignoring some patches?

I'd say either 1) Cherry pick all the commits you want from v2 to v3, or 2) Merge v2 to v3 normally, and then revert the radical commits afterwards. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web vis

[git-users] Re: Basics CVCS DVCS

Hi, Your basically right: With DCVS you have a two step procedure for sharing changes with other coders. I think, however, that this is actually an advantage. Having these two steps separate loosens the activity of coding/commiting, with the second phase of actually integrating with others. Yo

[git-users] Re: Smart HTTP cannot push return code 22

I'm not sure if this helps, but here's a Git repository tool that supports Smart HTTP authentication out of the box: http://gitblit.com/index.html It's still a bit new and fresh, but the author has been very quick the couple of bugs I ran into. It's also small enough that you could fix some th

Re: [git-users] git pull origin branch

On Sunday, August 21, 2011 11:41:50 PM UTC+2, Peter J Weisberg wrote: > > > There's nothing necessarily wrong with merge commits, but if you want to > straighten out your history before you push: > > $ git fetch origin > $ git rebase origin/branch > > You can also do it in one command like this:

Re: [git-users] How to change tracked branch?

I would do it like this. Say I'm on the master branch: $ git branch * master (is tracking the remotes/trunk svn branch) So, on this branch I have a few local commits. Let's make a new branch based on this one, called temp: $ git branch temp So, now let us bring our master/trunk back into the c

[git-users] Re: patch management and squash merge

A squash merge is where you take all the changes that would occur from doing a merge, and squash them together in one big commit. For your mail/patch question, it sounds like the git format-patchcommand/documentation could b

[git-users] Re: Git support archives devices

Hi Hernani, Which devices are you talking about? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/deTFXNUPtA4J. To post to this group, send email to gi

Re: [git-users] Re: Git support archives devices

Hi Hernani, That doesn't tell me much about what you are trying to do, or what kind of devices this is about. Can you try to restate the question, and include what you are trying to do, what your goals are, and what you need Git for? -- You received this message because you are subscribed to

Re: [git-users] Re: Git support archives devices

If you add a file to git, its contents (the blob) will get stored regardless. I have no idea what the effect of adding devices, blocks or channels, but symbolic links are just stored as you would expect. The contents of the linked directory are not added, only the link itself. If you commit it

[git-users] Re: git-svn: server-side madness has killed my buzz

Hi Nathan, Yeah, I often get problems with --ignore-paths too. Sometimes I wonder if it works at all. Did you consider limiting the revisions included in the clone? You can pass in a revision range to git-svn fetch like this: -r12033:HEAD -- You received this message because you are subscrib

[git-users] Re: Getting "page not found" when checking diffs in branched repositories

Looks like a Gitorious problem. You could try asking on their mailing list: https://groups.google.com/forum/#!forum/gitorious -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.googl

[git-users] Recorded talk on using git-svn

Hi, I just did a talk at JavaZone this week about using git-svn, and the recording is now online: http://vimeo.com/28762003 The demo features normal use of git-svn, plus setup of a git-svn mirror, using Jenkins to automatically sync the git mirror, and then putting the mirror on Github. May

[git-users] Re: Viewing html

No, Github repos will always show you the sources. However, there's a special mechanism for that on Github called "Pages": http://pages.github.com/ Aside from that, there's also a documentation function that will display readme-files rendered from wiki-markup below your source code. And finall

[git-users] Re: branching and tracking

Works fine for me too. Make sure you've made a git fetch Foo2 first. Git can't track objects it doesn't know about yet. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com

[git-users] Re: simple webpage to document git practices

A small comment: You can undo a git add with "git reset". git reset foo/.svn -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/KbyO6HybQf0J. To post to

[git-users] Re: git grep sorted by modified time

Well, it sounds doable with a bit of git-plumbing. I haven't got the git-foo myself, but you could ask on the git irc channel, or on the main git mailing list, if no-one here has an idea. -- You received this message because you are subscri

[git-users] Re: git-svn hashcode difference before and after dcommit

That sounds like a problematic setup. A git svn dcommit rewrites the commit by adding git-svn-id's to the commit message, and therefore gets a new hash (SHA). Having a dedicated person that commits changes into SVN will lead to the others having to reset and rebase, all the time, yes. I think i

[git-users] Re: Could you please tell me how to fetch a single file?

Regarding the "git sucks" thingie, I like to think of if like this*: There's simple stuff, and there's easy stuff. Simple means the opposite of complex. Easy, on the other hand, means it's very close to the stuff you already know. Git is "simple". Subversion is "easy". Git is *a lot* of featur

Re: [git-users] Why does this happen (unexpected git behaviour)

To put it in other words: Changes in the working tree are not part of a branch. Changes in the index (after add) are also not yet par of a branch. For some more insight, I'd recommend Scott Chacon's "Tale of the three trees" talk: http://www.infoq.com/presentations/A-Tale-of-Three-Trees Slid

[git-users] Re: Where to put a git repo?

I take it you are talking about the "central" repository where developers will be pushing in changes, and then have them being built and tested by the build process. Note that the build box will need to have non-bare repository (with a working tree) to work, while the central repository will ha

[git-users] Re: Git: CVS to Git import

I've done a lot of SVN to CVS imports, but nothing from CVS.. You could have a loot at the git-cvs tagged questions at StackOverflow: http://stackoverflow.com/questions/tagged/git-cvs One answer that caught my eye was this one: http://stackoverflow.com/questions/3669917/speedup-and-caveats-wit

[git-users] Re: git.wiki.kernel.org broken?

kernel.org recently suffered a security breach, and was unavailable for a long time. Reading the Site News section on kernel.org, it sounds like they are still working on getting the stuff back up. I have no idea why some wiki pages are missing.. Guess we just have to be patient and wait till t

[git-users] Re: managing only-local changes

The normal approach is pretty much what the error message says: Either commit first, or stash the changes. Example of the latter approach: $ git pull $ git stash save $ git pull $ git stash pop -- You received this message because you are subscribed to the Google Groups "Git for human beings

[git-users] Re: Git Revert Error Message?

A revert of [A] can result in conflicts with the changes you made in [B]. You should handle these conflicts normally (as any other merge conflics in git): 1) Git status, see which files have conflicts 2) Resolve the conflicts (picking which changes you would like to keep) 3) git add on the files

[git-users] Re: Git Revert, Checkout and Reset for Dummies

You're not the first one to get confused about those :) Maybe the biggest cause of confusion is that the last two (checkout & reset) have two modes: Either they work on files, or they work on revisions (or references, to be concrete). I'll try giving a short, but somewhat incomplete explanation

[git-users] Re: Gitignore

Hi, 1. You can configure .gitignore whenever you like. If you commit files, and later ignore them, they will be treated as normal checked-in files, until you delete them (from then on the ignore will take effect). 2. There's a good starting point in the Visual Studio - GitExtensions plugin (th

[git-users] Re: delete branches

Hi Thorsten, Each user has a full clone of the origin repository. As it is distributed, each user will have all branches (even though they "remote branches", they also fully exist in each clone. So user b can still do a git checkout origin/branch/test .. and keep working on that branch, pus

[git-users] Re: pull says up-to-date, push says no

You might want to try a shell plugin that shows you the current git branch: https://github.com/git/git/blob/master/contrib/completion/git-completion.bash If you're on Windows with Powershell, posh-git could help: https://github.com/dahlbyk/posh-git You may also want to set the upstream branche

[git-users] Re: Difference between git add . and git add --all?

>From git add --help -A, --all Like -u, but match against files in the working tree in addition to the index. That means that it will find new files as well as staging modified content and removing files that are no longer in the working tree. In other words, "git

[git-users] Re: What does git commit -a do exactly?

I take it you are asking about the -a argument for commit. "git commit --help" says: -a, --all Tell the command to automatically stage files that have been modified and deleted, but new files you have not told git about are not affected. This is basically the same as first ru

[git-users] Re: Getting the bad commit from git bisect run?

After running git bisect run, (I just actually tried bisecting for the first time, after two years of gitting :)), I ended up with HEAD pointing at the actual commit that broke the build. Can you double check that the commit before is not failing as well, or maybe there are some other variable

<    1   2   3   4   5   6   7   8   9   >