Re: [git-users] How to handle a longrunning branch

Hi, There is no way around resolving the conflicts if you want to keep your history. But there are strategies that can simplify the process. To decrease the number of conflicts you need to resolve, you can first interactively rebase your branch and "squash" successive commits. This means you

Re: [git-users] Undoable reset hard

Hi, I can answer the question to why I ended up using reset at least, though I can imagine more scenarios. I wanted to do a reset on the current working directory (read subdirectory of the repository) instead of on the whole repository, and assumed git would do as I intuitively expected it to,

[git-users] Undoable reset hard

Hi, I tried thinking of a way to prevent accidental deletion by git reset --hard command, as I recently faced such a problem. How can you write a wrapper replacing the command, so that it first does something like the following? It should create a new branch backup with all changes before

Re: [git-users] Re: git svn dcommit

On 17.11.2013 15:13, Thomas Ferris Nicolaisen wrote: You cloned an empty SVN repository? That sounds a bit like a corner case.. Try cloning a normal SVN repository, and see if dcommitting works there first. Thanks for your help! I committed a file with svn first, then cloned with git svn

[git-users] git svn dcommit

Hi, It has been a while since I used git svn. Can you help me with the following error? Can't call method “full_url” on an undefined value at /usr/lib/git-core/git-svn line 425 This happens when I call git svn dcommit after I cloned an empty svn repository with git svn clone, added several

[git-users] git treemap visualization

Hi, I made a treemap visualization for my git repository with JavaScript InfoViz Toolkit GitPython. Work in progress :) Maybe I'll add a view where you can see an authors activity and ask for it to be added to gitstats. Feel free to take a look or comment. www.youtube.com/watch?v=1vfDNVCgtLs

Re: [git-users] Linux Ubuntu Git submodule not working

Can you at least see the empty joy directory in your repository? Did you run git submodule update? What output did your init and update commands produce? Try git clone --recursive instead of a normal clone. If you have a recent version of git, this will initialize and update your submodule after

[git-users] Encryption

Hi, I was thinking about storing some configuration files to a remote git provider. The problem that keeps me from doing so is that the git hoster would have access to my potentially confidential data. Even though, I think that this is a common use case, since it seems very useful to have an

Re: [git-users] Encryption

Hi, I found a solution, which should work well. Actually, I think this could be integrated into git so that users can encrypt their files by setting an option in the git configuration or invoking an appropriate command. https://gist.github.com/873637 The downside is that it does not encrypt

[git-users] Re: git format-patch does not apply

On Jan 22, 12:23 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I think the details must be in what was inside these commits. Would be interesting if you can share a repository where you can recreate this. I was not able to reproduce this problem on a new repository. Finally, I solved it

[git-users] Re: git format-patch does not apply

back here. user.name=Johannes Müller user.email=dn...@gmx.de color.ui=auto color.branch.current=yellow reverse color.branch.local=yellow color.branch.remote=green color.diff.meta=yellow bold color.diff.frag=magenta bold color.diff.old=red bold color.diff.new=green bold color.status.added=yellow

[git-users] git format-patch does not apply

Hi, Here is a break down of a problem I currently face: I create a patch from the last two commits, reset to two versions before and apply the patch. I tried to do the same on a new git repository and it does work with the same sequence of commands. But on my submodule I get the following error:

[git-users] submodules refusing to update checked out branch: refs/heads/master

Hi, I wanted to manage one of my projects modules as a submodule, instead of continuously maintaining the submodule in the project, as well as in its designated remote repository. So I deleted the current module in my project and added it as a submodule from its remote repository. I did a few

[git-users] commit to github fork

Hi, I cloned a repository from github, changed my working copy and then forked the repository on github. What is the easiest way to commit my changes to the fork? Thanks a lot, Johannes -- You received this message because you are subscribed to the Google Groups Git for human beings group. To