I have this (git repo): A--B--C--D ->master \--E ->dev And I want to bring only commit D to branch dev (D doesn't depend on C), so that: A--B--C--D ->master \--E--D' ->dev But D' shouldn't get added to master after a merge: A--B--C--D--E' ->master \--E--D'/ ->dev This is because I want to bring only a file update ...
Hi, I have a PostgreSQL stored procedure which loops over a very large list, and makes changes to some of its members using UPDATE. Is there a way to commit these changes per iteration, not at the end of the function execution? It would allow me to run the function for shorts periods of time, making small changes at each run. Thanks, ...
I replaced a folder and all its contents with a symlink. That is removed the folder and added a symlink, in a single git commit. Git commit happened normally. However when I try to push to the upstream svn, it complains that the file exists. Now, how do I amend my commit to not contain the git add of the new symlink and make it a new c...
A group of developers that I am working with switched from VSS to SVN about half a year ago. The transition from CheckOut-CheckIn to Update-Commit has been hard on a number of users. Now that they are no longer forced to check in their files when they are done (or more accurately, now that no one else can see that they have the file chec...
Hi All, Anyone know of a way to send diff emails when a commit is made to TFS 2010? Essentially, the email should show all files modified, along with all lines added/edited/deleted (as well as a few "context lines" i.e. unchanged lines above and below the modified areas) Thanks! ...
I have a source file where 2 features have been added. In order to allow cherry-picking, I'd like to commit that in 2 phases: one for each feature. Until now, in similar situations, using git add -p served me well, to commit one feature while leaving the local files in their final stage. However, I now have the problem that git add -p w...
We have an svn project that also has several plugins in vendor/plugins - all pulled in via svn:externals. I have a commit that spans both the main project and several of these plugins all at once. When I do an svn st it lists all my changed files across all the correct sub directories, but when I try to do an svn ci it only shows files...
I lost my last commit because I accidentally ran "git reset --hard HEAD^". Note: I didn't want to put the "^" at the end. Is there any way to get it back? It was 2 days of work :( ...
Hello, I am inserting a lot of records using mysqli commit statement, using this code from http://www.php.net/manual/en/mysqli.commit.php#88857. I then check affected rows using: $mysqli->affected_rows but even though all records have been inserted, I get zero affected rows. How can I check when commit failed and retrieve the error? Tha...
I have two repositories. I started a project locally on my development machine, later cloned it to a testing environment on the customers server. I mimic the environment on the customers server, but for that I need to have some files (and some lines in some other files) to be only present on my local machine, but they must not appear on ...
The situation: master is at X; quickfix1 is at X + 2 commits then i started working on quickfix2, but by accident took quickfix1 as the source branch to copy, not the master. Now quickfix2 is at X + 2 commits + 2 relevant commits Not I want to have a branch with quickfix2, but without the 2 commits that belong to quickfix1. I tried to...
I added a second exe file in the Commit folder of a setup and deployment project, which has another exe in the Application Folder. I plan to run the first exe after the latter. First when I tried to run the main exe which is in the Application Folder, an error message came that it cannot run the second one since .msi file is missing. Aft...
Does the inserts are finished with the transaction commit? Or they can be finished later? ...
Hi. In my J2ee web application I am using a datasource accessed stored in the weblogic server and accessed through jndi. In normal datasource bean declaration there is a property defaultAutoCommit which can be set to false. Is there a similar property or is there a way to set something like this when using datasource in JNDI. Because cur...
Hey Hey, I've never had the chance to work with a team on a repo, so I'm wondering if there is a proper way to document your changes. For example, maybe add a tag(s) such as: bugfix, update, implement? Just curious on how professionals describe their commits. Hopefully it'll aid me in keeping the project organized... ...
How to stage and commit all the files including the newly added files using a single command. ...
Every time I do a git diff, despite a MILLION commits since the first one, it keeps on giving me these REALLY OLD changes that were committed AGES ago to do with file deletions. I deleted an entire folderful of stuff in a commit about 7 commits ago, and still on branch or merge, git acts like the deletion is new. Doing GIT DIFF STILL s...
I've made some experimental code that I would like to save in the repository, but I don't want it on the main branch. How would you commit this to a branch? Maybe I got this wrong, but of what I've understood about branching, all you actually do is copying already checked in code to another directory in the repository. I suppose one cou...
Hi I am trying to find how to reference branch start commit from script. I mean the commit sha at which branch was forked. Moreover I expect it work for history made from svn repo. http://stackoverflow.com/questions/1006775/git-how-to-reference-the-initial-commit/1007545#1007545 just gives first commit of repo creation and not feature...
Somewhat new at Git.. I am working on a project, and had all of my tests passing on the master branch. I then made some changes, and when everything started failing, I realized that maybe I should have made those changes in a different branch. Is there I way I can commit the changes to a new branch without commiting them to my master ...