possibilité de spécifier l'origine

implémenter merge, log, diff
This commit is contained in:
2015-02-20 00:44:30 +04:00
committed by Jephte CLAIN
parent 18a2c641de
commit de7d12aba6
2 changed files with 68 additions and 35 deletions

View File

@@ -571,7 +571,7 @@ function git_ensure_branch() {
local branch="$1" source="${2:-master}" origin="${3:-origin}"
[ -n "$branch" ] || return 2
git_have_branch "$branch" && return 1
if git_have_rbranch "$branch"; then
if git_have_rbranch "$branch" "$origin"; then
# une branche du même nom existe dans l'origine. faire une copie de cette branche
git branch -t "$branch" "$origin/$branch" || return 2
else