From d32bcf353ff915f9c2b179ca556342e35a4b63f7 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Thu, 25 Feb 2016 10:16:09 +0900 Subject: [PATCH] Close #122. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84b1f0d..5159197 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [0.9.0][v090] - Not released yet -* Update plugins with merge conflicts by fetching HEAD and applying a hard reset as a last resort. This strategy is only executed on the `master` branch, other branches are not affected. If branch `my-feature` is checked out at the time of the update, Fisherman first saves the branch name, checks out master, updates and checks out `my-feature` again after the operation is complete. +* Update plugins with merge conflicts by fetching HEAD and applying a hard reset as a last resort. This strategy is only executed on the `master` branch, other branches are not affected. If branch `my-feature` is checked out at the time of the update, Fisherman first saves the branch name, checks out master, updates and checks out `my-feature` again after the operation is complete. Close #122. * Update plugins with a dirty working tree by recording changes in the stash and re-reapplying them again after the git-pull update strategy completes.