]> Tony Duckles's Git Repositories (git.nynim.org) - dotfiles.git/commit
git.nynim.org / dotfiles.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: e4973cb) | patch
bin/git-up: Rewrite to support 'git fetch --all --prune'
authorTony Duckles <tony@nynim.org>
Sat, 22 Dec 2012 03:57:05 +0000 (21:57 -0600)
committerTony Duckles <tony@nynim.org>
Sat, 22 Dec 2012 04:06:13 +0000 (22:06 -0600)
commiteafa1b7b3146d43996f69d5d8a0b105ecdb43cd5
tree2fe817a562392504fbfbd4deab3fe9ad4faff716tree | snapshot (tar.gz zip)
parente4973cb91e053cf666c1f66168f0a586a659f84acommit | diff
bin/git-up: Rewrite to support 'git fetch --all --prune'

* Use "[git fetch] --all --prune" (if no given <repo>+<head>) to
  fetch changes from all remotes and prune nonexistent branches.
* Use "[git merge] --ff-only" to ensure we only do fast-forward
  merge from `git pull`.
* Grab HEAD before and after pull to see if changed. Previous code
  relied on HEAD@{1} (i.e. git reflog) which is a false-positive if
  HEAD didn't actually change during pull.
bin/git-up diff | blob | history
My $HOME: shell environment, vim configuration, and other misc dotfiles and scripts.