diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:24:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:24:43 -0700 |
| commit | 14230580af96353b911ec1de85517d71c8cfe6b8 (patch) | |
| tree | b99bb8d1efbd885b3243cf7b32a4c1773853b5a5 /git-pull.sh | |
| parent | c37d7b50f345e8f52e3e902384cd87d96decc155 (diff) | |
| parent | 5061a44bcc7bfab0764b3854b8b2df69a93675ad (diff) | |
| download | git-14230580af96353b911ec1de85517d71c8cfe6b8.tar.gz | |
Merge branch 'pt/pull-log-n'
"git pull --log" and "git pull --no-log" worked as expected, but
"git pull --log=20" did not.
* pt/pull-log-n:
pull: handle --log=<n>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index 9005171b74..b8ae005920 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -81,8 +81,8 @@ do diffstat=--no-stat ;; --stat|--summary) diffstat=--stat ;; - --log|--no-log) - log_arg=$1 ;; + --log|--log=*|--no-log) + log_arg="$1" ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) no_commit=--no-commit ;; --c|--co|--com|--comm|--commi|--commit) |