aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Spiers <git@adamspiers.org>2015-01-05 18:04:29 +0000
committerAdam Spiers <git@adamspiers.org>2015-01-05 18:04:29 +0000
commit61d38a36300952c12a50a30d63477202b40ae999 (patch)
tree07b6e41c202da2570bb6058e13847a971b4be102
parent1a0180663ee4f52295f44d62d9369a2f0a86ff64 (diff)
downloadgit-deps-61d38a36300952c12a50a30d63477202b40ae999.tar.gz
add links to OpenStack Nova
-rw-r--r--README.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index 1f4b532..337c8e0 100644
--- a/README.md
+++ b/README.md
@@ -96,9 +96,10 @@ History
This tool was born from experiences at
[SUSEcon](http://www.susecon.com/) 2013, when I attempted to help a
-colleague backport a bugfix in OpenStack Nova from the `master` branch
-to a stable release branch. At first sight it looked like it would
-only require a trivial `git cherry-pick`, but that immediately
+colleague backport a bugfix in [OpenStack](http://www.openstack.org/)
+[Nova](http://docs.openstack.org/developer/nova/) from the `master`
+branch to a stable release branch. At first sight it looked like it
+would only require a trivial `git cherry-pick`, but that immediately
revealed conflicts due to related code having changed in `master`
since the release was made. I manually found the underlying commit
which the bugfix required by using `git blame`, and tried another