зеркало из https://github.com/microsoft/git.git
git-pull: Allow --stat and --no-stat to be used with --rebase
Forwards the --stat, --no-stat, and --summary options on to git-rebase. Signed-off-by: Tor Arne Vestbø <torarnv@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a9c3821ca2
Коммит
a334e1254c
10
git-pull.sh
10
git-pull.sh
|
@ -16,7 +16,7 @@ cd_to_toplevel
|
|||
test -z "$(git ls-files -u)" ||
|
||||
die "You are in the middle of a conflicted merge."
|
||||
|
||||
strategy_args= no_stat= no_commit= squash= no_ff= log_arg= verbosity=
|
||||
strategy_args= diffstat= no_commit= squash= no_ff= log_arg= verbosity=
|
||||
curr_branch=$(git symbolic-ref -q HEAD)
|
||||
curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
|
||||
rebase=$(git config --bool branch.$curr_branch_short.rebase)
|
||||
|
@ -28,9 +28,9 @@ do
|
|||
-v|--verbose)
|
||||
verbosity="$verbosity -v" ;;
|
||||
-n|--no-stat|--no-summary)
|
||||
no_stat=-n ;;
|
||||
diffstat=--no-stat ;;
|
||||
--stat|--summary)
|
||||
no_stat=$1 ;;
|
||||
diffstat=--stat ;;
|
||||
--log|--no-log)
|
||||
log_arg=$1 ;;
|
||||
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
|
||||
|
@ -188,7 +188,7 @@ fi
|
|||
|
||||
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
|
||||
test true = "$rebase" &&
|
||||
exec git-rebase $strategy_args --onto $merge_head \
|
||||
exec git-rebase $diffstat $strategy_args --onto $merge_head \
|
||||
${oldremoteref:-$merge_head}
|
||||
exec git-merge $no_stat $no_commit $squash $no_ff $log_arg $strategy_args \
|
||||
exec git-merge $diffstat $no_commit $squash $no_ff $log_arg $strategy_args \
|
||||
"$merge_name" HEAD $merge_head $verbosity
|
||||
|
|
Загрузка…
Ссылка в новой задаче