| commit | 3090dfab5938a943099928e5daa394fe4e568c59 | [log] [tgz] |
|---|---|---|
| author | Brian St. Pierre <brian@bstpierre.org> | 周三 11月 03 16:48:41 2010 -0400 |
| committer | Brian St. Pierre <brian@bstpierre.org> | 周三 11月 03 16:48:41 2010 -0400 |
| tree | 7395014cac2e4624a71a6dd7293ba9772dbebb15 | |
| parent | 5ff0b47909be3e8bdd4da04b9a22cfc1b170609f [diff] | |
| parent | e26bfbc5b537b9c65cc6a27ed0579168e6ac4a92 [diff] |
Merge remote branch 'mine/develop' into develop
diff --git a/gitflow-common b/gitflow-common index e5ffc74..4255f99 100644 --- a/gitflow-common +++ b/gitflow-common
@@ -148,7 +148,7 @@ git_is_branch_merged_into() { local subject=$1 local base=$2 - local all_merges=$(git branch --no-color --contains $subject | sed 's/^[* ] //') + local all_merges="$(git branch --no-color --contains $subject | sed 's/^[* ] //')" has $base $all_merges }