I don't want to end up with 82 feature branches hanging around, so I'm wondering what the potential drawbacks are to simply deleting the feature branch as soon as I merge it to master. Workflow: git co -b feat-xyz hack hack git ci hack some more git ci git co master git merge feat-xyz smoke test git br -d feat-xyz Any issues here? ...
Here's my scenario: I'm working on fixing bugs in file1 in a local branch. My coworker is in his own local branch, merging file1 into file2 in a refactor. He finishes his work and merges back into master and pushes. Now file1 no longer exists in the HEAD. When I do a pull and try to merge my file1 changes back into master, what will ha...
I'm trying to use git instaweb with Ruby' webrick (which I have installed) on Mac OS X, but every time I fire up $ git instaweb --httpd=webrick I get the following error: webrick not found. Install webrick or use --httpd to specify another httpd daemon. Like I said, I do have webrick, so I don't know why git instaweb won't use i...
I like how you can see what went into a git with git show rev I haven't found an equivalent in Subversion. It seems Subversion wants you to do a diff between two commits to get anything reasonable. Am I mistaken, or is there an equivalent to git show in svn to just see what went into a commit? ...
I have a couple of commits where my email address is wrong in the history. Should I, How can I rewrite this history to reflect the correct email address? EDIT: If I choose to rewrite history, what is it that another user will have to do to fix their checkout? Thanks. ...
I've set up Capistrano to ask me which git tag I want to deploy: # deploy.rb set(:branch) { Capistrano::CLI.ui.ask('Tag to deploy:') } This works as expected - if I specify v0.75 it will deploy that tag. However, I'd love it if I could print out the list of my tags before I get asked which one to deploy, with something like this: gi...
I have: folder_a/app_1.0 folder_b/app_1.1 And let's just say I'm working off of the master branch in both folders/repos. How can I merge the branches together? ...
Is there anyone using git in such a fashion? I would like to distribute some multimedia content from a server to some Android remote devices. I would like them sending back a log file with device usage statistics (provided by an android app I will write). The server could be anything but I would prefer a linux box. I thought that sin...
Hay, I've only just started to use GIT and think its wonderful. However I'm a little confused over what the 'merge' does. Say we have a working project in the brach called A I got home and make changes to this brach and save it as B and another programmer makes changes to A and saves it as C Is there any way to merge the two branches ...
I have some trouble with finding the tag that is checked out. When I do: git checkout tag1 git branch I can't seem to find out which tag I'm on. It only logs: * (no branch) master Is it possible to find out which tag that are checked out, that is, in the above example, 'tag1'. Thank you! ...
/source/application/controller ( visible ) /source/application/models ( visible ) /source/application/views ( visible ) /source/framework ( not visible ) can we somehow do like this at github or in any git sites ? svn ? or maybe other SCM ? ...
I am experimenting with JGit for a project and while it mostly works, retrieving the oldest (first) commit does not. Here is the code: RevWalk rw = new RevWalk(new Repository( new File("/path/to/git"))); RevCommit oldest; Iterator<RevCommit> i = rw.iterator(); if (i.hasNext()) oldest = i.next(); Co...
I have the following scenario: * ab82147 (HEAD, topic) changes * 8993636 changes * 82f4426 changes * 18be5a3 (master) first I'd like to merge (non fast-forward) topic into master. This requires me to: git checkout master git merge --no-ff topic But checking out master, and then merging topic into it causes git to change my workin...
When viewing a diff using git diff, each change starts with line like: @@ -28,41 +20,10 @@ namespace ConsoleApplication1 For C, the final part is quite descriptive – it shows for example the function in which the change occurred. But for C#, it only ever shows the namespace, which isn't very useful. I think that's because it shows las...
Is there a Javascript implementation of Git? I'm wanting to use HTML5 to create a rich Javascript application and have the idea that I could use git to track changes to the data. So, I'm wondering if there is a javascript implementation of a git client, or maybe some way of controlling a git repository by making POST requests. ...
As a subset of the question detach-subdirectory already made before and considering the fact that even though a lot of questions were made about the process of splitting and merging git repositories, I couldn't find one that touches the subject of splitting when submodules are present. So in the following scenario: .git/ .gitmodules fo...
I'm new to git, but after attempting to get more information using $git help [command_name], it says "launching default browser to display HTML...", but nothing happens. Since installing Win7 64-bit, I've noticed issues with lower level drivers, but not so much with applications. Any known issues with Win7 64-bit and Git-1.7.0.2-pre...
i have an open source ruby project on github, where my master branch represents what has been released, and my dev branch represents what will be released next. the master branch is ~ 80+ commits behind the dev branch, and the dev branch contains fairly significant architectural changes. a contributor has sent me a pull request for cha...
I want to warn the user if their commit message doesn't follow a certain set of guidelines, and then give them the option to edit their commit message, ignore the warning, or cancel the commit. The problem is that I don't seem to have access to stdin. Below is my commit-msg file: function verify_info { if [ -z "$(grep '$2:.*[a-zA-Z...
How my client can apply my patch created by command git diff without git installed? I have tryed to use patch command but it always asks file name to patch. ...