Git Subtree Merge and git-svn

Issue Git submodules do not play nicely with git-svn; git subtree merging is a more appropriate strategy for my specific use case. Resolution This is my recipe (borrowed heavily from the formal git documentation). git checkout -b TRY-MERGE master git remote add -f Bproject /path/to/B git merge -s ours --no-commit Bproject/master git read-tree --prefix=dir-B/ -u Bproject/master git commit -m "Task - JIRA-001 - Merge B project as our subdirectory" git checkout master git merge TRY-MERGE master -m "Task - JIRA-001 - Merging subtrees into project. »

Commit a linear git history to subversion

Issue I was recently asked to integrate my local development (which I had done under git management) into our central Subversion server. How to do this while preserving my commit history? Resolution After a lot of reading (and an upgrade to git-1.7.0) I found the following recipe to work for me. git branch master.bak master git-svn init svn://repo.domain.local/Project/trunk/sub/directory git-svn fetch git checkout -b svnrebase git-svn git-svn rebase git rebase --root --onto svnrebase master git-svn dcommit »

Reset The Windows Update Catalog

Insert the Windows Vista installation disc in the disc drive, and then restart the computer. When you are prompted to restart from the disc, press any key. When you are prompted, configure the Language to install, Time and currency format, and Keyboard or input method options that you want, and then click Next. On the Install Windows page, click Repair your computer. On the “System Recovery Options” page, click the version of the Windows Vista operating system that you want to repair, and then click Next. »

Reset HP Integrated Lights Out Board to Factory Defaults

Issue Cannot login to HP Integrated Lights Out Board (bad credentials). Cause Someone failed to record the configuration. Solution If an operating system supported by HP Proliant Essentials is installed along with a recent Proliant Support Pack, you may reset the Integrated Lights Out board to its factory defaults. Use the HP Lights-Out Online Configuration utility. C:\Program Files\HP\hponcfg\hponcfg.exe /reset »

Remove a Range of Unwanted ZFS Snapshots from the Command Line

Remove a range of unwanted snapshots, from the command line, if necessary. In the following example, all automatic snapshots in the bash shell are removed. for s in $(zfs list -H -o name -t snapshot | grep @zfs-auto-snap); do zfs destroy $s; done One could add a secondary pipe and grep statement to filter on individual file systems. Reference: How to Manage the Automatic ZFS Snapshot Service »