Category: git - page 2

• Git Pull via Sneakernet

  8 Jun 2012 • gholms • Category: git

  Today I found myself needing to move some commits between two repositories. In general the best way to do this is by pulling changes from one into the other, but in this case the repositories did not have direct access to each other. Rather than copying an entire repository from one machine to another or mucking about with a pile of patches, we can save time by performing the sending and receiving sides of the network-enabled git fetch command by hand.

  In the source repository, add the changes we want to move to a bundle that we can copy to a USB stick:

  $ git bundle create changes.bundle master..mybranch
  Counting objects: 5, done.
  Delta compression using up to 4 threads.
  Compressing objects: 100% (3/3), done.
  Writing objects: 100% (3/3), 313 bytes, done.
  Total 3 (delta 2), reused 0 (delta 0)
  $ cp changes.bundle /media/usbstick
  

  In the destination repository, ensure that we have the commits necessary to use the bundle and then tell git fetch to grab the changes from it:

  $ git bundle verify /media/usbstick/changes.bundle
  The bundle contains 1 ref
  7a1d2087f10e6db33e6b4a28e2c427b65238a62c refs/heads/mybranch
  The bundle requires these 1 ref
  6f5fced94ef76f1b46e259db72ad6fc39c49ba72
  /media/usbstick/changes.bundle is okay
  $ git fetch /media/usbstick/changes.bundle mybranch
  Receiving objects: 100% (3/3), done.
  Resolving deltas: 100% (2/2), completed with 2 local objects.
  From /media/usbstick/changes.bundle
   * branch            mybranch   -> FETCH_HEAD
  $ git merge FETCH_HEAD
  Updating 6f5fced..7a1d208
  Fast-forward
   README |    2 ++
   1 file changed, 2 insertions(+)
  

  ---

• Fixing a Git Branch that Started in the Wrong Place

  21 May 2012 • gholms • Category: git

  Today I did some work on a branch in git only to discover that I based it on some unstable code rather than the stable code that I usually want to use as a baseline.

  

  You can fix this by using a bit of git’s rebase magic:

  $ git rebase --onto master testing
  

  This moves the entire current branch onto another.

  

  ---