Is it possible to merge only the changes for a sub-directory from a local git branch to a remote git branch or is it "all or nothing"? For example, I have: branch-a - content-1 - dir-1 - content-2 and branch-b - content-1 - dir-1 - `content-2 I only want to merge the contents of branch-a dir-1 with the contents of branch...
So, I am using Git GUI to make a repository. But I cant find ANY trace on Google, the Documentation, or anywhere else what a 'Revision Expression' is, and it is required to create a new Branch. Also, it seems that this is used many other places in the program, so I belive it is important to know. I did find a question on this on Stack...
In my personal git repo, I have a directory that contains thousands of small images that are no longer needed. Is there a way to delete them from the entire git history? I have tried git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch imgs" HEAD and git filter-branch --tree-filter 'rm -fr imgs' HEAD but the size...
I am having an issue with rebasing from master on to a 'deploy' branch within one of my repositories. My repo is setup as follows: master - of course, the main branch deploy - a branch created where files like Capfile, deploy.rb etc are created and configured - these changes will NEVER be merged back into Master Generally my workflow...
Which free source control system is most preferable with reason for home projects and documents? I am thinking to use Subversion (as I am familiar with it). Characteristic of home project: Most likely single person will be committing changes. (May be one day (not now), it is possible that I share a project with my friend who is in ot...
The default git diff behavior is to open each diff file in serial (wait for previous file to be closed before opening next file). I'm looking for a way to open all the files at once - in BeyondCompare for example this would open all the files in tabs within the same BC window. This would make it easier to review a complex set of chang...
I have a project that has existed in two SVN repositories. The second SVN repo was created simply by adding the repos from a checkout of the old SVN repository without SCM info stripped. The content of the files are byte identical, but there is no associated SCM meta-data. I have taken the new SVN repo and ported it into a Git repo vi...
Can someone show/point/help me to a resource for distributed development Git example or guide? I'm a newbie and through I tried to google, I'm overwhelmed by the amount of information available. My situation is that I have few developers around the globe and and ideally we don't have to deal with a central repository like Svn, but stil...
ppl, I have put my project on github at some location [email protected]:myname/oldrep.git. Now I want to push all my code to a new repository at some new location [email protected]:newname/newrep.git... so I used the command git remote add origin [email protected]:myname/oldrep.git but I am receiving this fatal: remote origin alrea...
Is there any way to revert or undo git pull so that my source/repos will come to old state that was before doing git pull ? I want to do this because it merged some files which I didn't want to do so, but only merge other remaining files. So, I want to get those files back, is that possible ? Thanks :) EDIT I want to undo git merge for ...
Hi, Is it possible to configure git diff to use emacs diff? If yes, can you please tell me how? Thank you. ...
Hi I am having terrible time getting files that reside on C:/ drive on remote computer. I can clone projects if they are under Cygwin installation folder. But I cannot get anything going with my real projects if they reside in something like "/cygdrive/c/myproject/git/export"? So I cannot get anything from the line below "ssh://user@...
Git-svn allowed for a duplicate filename, just with different case, to be added to our subversion repository. On Windows this meant that subversion could not checkout the file, complaining of a duplicate. Another developer deleted the incorrectly cased version from the repository. Now when trying to do a git-svn rebase I get a "could n...
Hi, Our code is C++ and is managed in svn. The development is with Visual Studio. As you know Visual Studio C++ is case insensitive to file names and our code unfortunately "exploited" this heavily. No we are porting our application to Linux + gcc, which is case sensitive. This will involve a lot of file names and file changes. We plan...
My team's development processes are based on continuous integration. The only branches we create are maintenance branches when we release, but otherwise developers are expected to commit regularly (daily if not more often) to trunk, so that everyone's work is always integrated, continually tested, and all that good stuff. My understandi...
SVN's log has a "-v" mode that outputs filenames of files changed in each commit, like so: jes5199$ svn log -v ------------------------------------------------------------------------ r1 | jes5199 | 2007-01-03 14:39:41 -0800 (Wed, 03 Jan 2007) | 1 line Changed paths: A /AUTHORS A /COPYING A /ChangeLog A /EVOLUTION A /IN...
Reflective/Cyclic Merging This is easiest to explain with an example. Suppose you are working on a feature branch copied from your trunk. During the development process you regularly merge ''all'' new changes from trunk to your branch so that the branch stays in "synch" with the work occurring on trunk. When you eventually merge your...
Hi guys, I want to use xxdiff for my merging needs. I have just started using git, and I integrated xxdiff to work with it on (git mergetool). My problem is that I can't find any resource that teaches the basic of merging branches with xxdiff, so I get into this three file window with LOCAL BASE REMOTE, but I don't know where to start ...
How to specify 'git send-email' to send mail on a specific patch? I have 4 commits but I haven't done a 'git pull'. When I do 'git send-email', it will send out 4 emails (1 patch for each commit). How can I configure git send-email so that it can send out email just for the last commit? Thank you. ...
Hi, I make a change and then I 'git stash' and then I 'git stash apply' My question is 1. why after I 'git stash apply', my change becomes 'staged'? i.e. I won't see anything if I do 'git diff', I only see my difference if I do 'git diff --cached'? Is there anyway to 'unstage' my changes staged by 'git stash apply' command? Is there...