I (mostly) use git to download and compile various projects from their source code, keeping my source in /usr/local/src and installing the binaries in /usr/local/bin. Following the building procedure, usually with ./configure && make && make install, I'm left with a lot of cruft that ends up as 'new' files in my local git repository. T...
Git has a bunch of procedures for altering history. (rebase, filter-branch, commit --ammend, guilt, stacked git, etc) However, it may sometimes be preferable if there was a procedure to turn the last few commits into a file containing a series of patches with the commit metadata, which could be freely edited, and then turned back into a...
Is it possible to create a commit message with link to other repository commit? Eg. something like [Username\Repo\commitHash] Usage example: if some bc break would happen in some framework's commit, I'd like to link to this very commit in my own commits updating my code which uses this framework. ...
I'm trying to fix an intermittent bug in git-svn. The problem is happening in Windows XP only, with both Cygwin git (perl v5.10.1) and msysGit (perl v5.8.8). With any operation that involves a fetch, I'm able to get partway through and then the operation dies with a message similar to Couldn't open .git/svn/refs/remotes/trunk/.rev_...
i would like to use a git plugin while coding on gedit. i mean by that buttons for commit or shortcuts. thank you. ...
I add the following line to .gitignore but when I type "git status" it show the file as unstaged file.what's the problem? all other patterns work good. .gitignore file content: sites/default/settings.php ...
I have a bare repository and two working copies - one on my machine, the other on the server. It turned out that I have to .gitignore a certain file that has to be specific for every machine. Let's call it 'settings.py'. This file is already commited. I did put 'settings.py' in .gitignore to ignore it. When I now change the file on my m...
I really don't like the git staging area, it just makes my life unnecessarily confusing. Is it possible to disable it so that all edited and new files are in a single context? So that git diff shows the diff between the repository and my working directory (and I don't have to also type git diff --cached) and so that git ci checks in my ...
I have been using git-svn working happily along, branching for whatever, rebasing from and dcommitting to trunk and then the powers that be decided that we are going to start working out of a branch instead of trunk. My question is how do I get branches that were spawned from master that was tracking trunk to rebase/merge into the new lo...
I find myself referring to the root commit for various reasons. I usually make a tag called first or root to make it easier, but I have been dealing with quite a few repositories lately and even this manual tagging is getting quite tedious. Is there an easy way to refer to the root commit, something similar to HEAD or FETCH_HEAD? ...
I've been using Git as a fat client for a Subversion repo, which has been great. I'm supposed to follow the one-commit-per-Trac-ticket methodology, but I much prefer having a rich history of atomic commits for my own benefit, so I've gotten into the following habit: Make topic branch for Trac ticket Hack away, making several commits Us...
I have a file named "myfile.php" on my server and in my computer. I want to remove myfile.php from git index in order to prevent changing myfile.php in server.I do this by adding the file to .gitignore and removing the file from index with "git rm --chached myfile.php" Now when I run "git pull" it removes the file itself from working dir...
I'm trying to set up Git for staging my website so that I can git pull to get the current version to work on locally and then git push to push the changes to the remote server. I've got it set up so that it works the way I want it to, but after I push, I have to manually run git checkout -f or git reset --hard HEAD on the remote server....
In commit messages there is a rule which says: "Lines starting with '#' will be ignored" Now I'm confused if these lines is ignored why we use them at all? running "git log" only shows lines not started by #.and ignored lines is not shown. Is there any command which shows the lines starting with '#'? ...
Another dev checked his .rvmrc into the git repo. I've since removed it and added it to gitignore, but every time in need to go back in time it overwrites my .rvmrc. I'm on OSX, so I've discovered I can use the OSX file locking mechanism ("Locked" checkbox in Get Info) to stop this happening on my dev machine, but how would this be don...
How do I configure automatic push in Mercurial and Git? Sometimes I forgot to push in a computer, and when I move my location, I'm out of the sync with the good code. Is there a way to mercurial and git do this every hour, for instance? ...
Practically everytime I stage a textfile (that's most of em), I get the message from git gui (I use msysgit) that It replaced (or is about to) line endings with CRLF's. Obviously I want that (and there's a setting for it huraah), but I don't want the annoying message popped up all the time! Any way to keep the setting, but turn off/disa...
Sometimes for example I change a word in line 100 and delete last 4 lines. When I run "git diff" It shows a log which has a -(minus) and +(plus) before all lines whereas I changed only mentioned lines. I thought it may be due to changing number of all lines but when I saw the changes again I didn't see any change to line numbers. so wha...
I'm using Git Gui and Gitk on Windows. How do I undo a hard reset from within the past two hours? (Is it possible to do this from these applications, without using the command line?) I saw this SO post, which says that undos are possible before git's garbage collection occurs. I might have quit and reopened one or both of these applica...
I've looked around for a project management system, I've tried to use this one but it lacks some features I want and doesn't really seem to be under any sort of active development. I only need a few features: Basic project/task management Very good git integration (when I pull/push my repo I want the management files to go too) Vim in...