Torvalds seems to have the following prompt. [torvalds@g5 git]$ The first word is username. g5 seems to be a branch in Git repo, while git shows that it is a branch in Git. My current prompt PROMPT="$" How can you have a similar prompt as Torvalds'? ...
I run the following codes separately as my prompt unsuccessfully in .zshrc. This suggests me that apparently I do not have a program called __git_ps1. It is not in MacPorts. #1 PROMPT="$(__git_ps1 " \[\033[1;32m\] (%s)\[\033[0m\]")\$"$ #2 PROMPT="$(__git_ps1 " (%s)")\$"$ #3 # Get the name of the branch we are on git_prompt_i...
I get git-status at ~/bin: # Untracked files: # (use "git add <file>..." to include in what will be committed) # # screen/dev/ I run git add --force screen/dev/ I get the same git-status as before. I add each file in the folder independently, but I get the same git-status. There is no .git in screen/dev/. The folder seems...
I am using git-svn with the following workflow now git clone <SVN TRUNK URL> #done once subsequently when I work on a feature git branch featureZ git checkout featureZ #make edits for featureZ git commit git checkout master git svn rebase # fetch changes from server git checkout featureZ #go back to branch #git merge master git re...
I ask myself this every time I replace a Photoshop .psd file that I have under version control. You can see with ls -l that PS has created a thumbnail icon in the resource fork. ...
We've got a repository that has only a master branch (for the purpose of this discussion). Somehow we've got to a situation where a developer has merged his local master and pushed and managed to lose other commits. The situation is that for a few commits, if we run git log from the root of the project it shows the commit. If we pick ...
This question is based on the thread. I have the following Git-prompt at the moment. I get the following warning after cding to a non-Git folder. fatal: Not a git repository (or any of the parent directories): .git fatal: git diff [--no-index] takes two paths fatal: Not a git repository (or any of the parent directo...
I've just had my first experience with rewriting the history of one of my repos (using git-filter-branch). The problem is that the repo had several tags, which after rewriting seem to be completely disconnected from the resulted history. I think this is due to the fact that the history associated with the tags hasn't been rewritten, so t...
What's the git equivalent of svn status -u or more verbose svn status --show-updates. The svn status --show-updates command shows the updates that the svn update command will bring from the server. Thanks! ...
I have an already initialized git repo that I added a .gitignore file to, how can I refresh the file index so the files I want ignored get ignored? ...
I am seeing git svn fetch repeatedly retrieve the same Subversion revisions when it finds branches in my Subversion repository. We are using the standard Subversion repository layout, with top level /trunk, /tags, and /branches directories (and the git repository was created with 'git svn init -s'). However, the problematic branches ar...
If I have a code base. Code base-1, Code Base-2. I run the command: git init git add . git commit -m "Initial Commit" Into both repositories (directories). There are code differences between code base-1 and code base-2 I can't branch them because they already contain differences of about 0.1%. The filenames are the same but th...
Which is the best Visual SVN Diff displayer for Linux. BeyondCompare and VisualSVN1.5 work well on Windows. What are the equivallent tools for Linux. Specifically Ubuntu. I know command line diff works; But I'd like multiple column syntax highlighted and differences. Better if the tool has a support for Git and Hg as well. ...
My initial commit contained some log files. I've added *log to my .ignorefiles, and now I want to remove the log files from my repository. git rm mylogfile.log will also remove it from the local file system. ...
Hi All, We've just inherited a massive client project that is in VS.NET 2003. We typically use SVN and I installed and put the code into SVN. It's been 5-6 years since I've had to deal with the issue that VS.NET web projects don't deal well with folders that start with ".". I used the modified tortoise version in the past, but we ha...
Solved Problem: to show external code dependency by submodules: Thanks to VonC! Current Problem: to have a submodule without duplicate contents in two folders A temporary solution to the current problem: to change the name of the folder to bin-github, since the name of the folder as a submodule is bin. This means I need to duplicate c...
I want to start controlling our inhouse applicatoin using Git. And I thougth that if I can export all the application to text (not exporting object by object) and then using Git in them. And of course I will need a method to import this text files into powerbuilder if I need to make a merge or revert some changes. Another solution c...
I am wanting to toy around with Mercurial a bit, so I am trying to convert one of my existing repositories over. I run the following command on my Mac: hg convert myrepos myrepos-hg The command successfully imports all of my commits, but it doesn't bring along the 8 or so tags that were marked in the Git repository (nor are any of th...
I've just started using git, been used to bzr in the past. Here is my problem: I have a git repo (let's call it "default") with files A, B, and C. (I actually update others' modifications with svn.) I clone that repo to "defaultmods" and add files D, E, and F. I notice that someone updated A and C and added file G so I want those file...
This is probably the simplest newbie question. I have a project in which I've run git init. After several commits, I do a git status which tells me everything is up to date and there are no local changes. Next, I make several consecutive changes and realize I want to throw everything away and get back to my original state. Will this c...