diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:24 -0700 |
| commit | 4cb9fe35c015c576177d6a0ce096c935876544fc (patch) | |
| tree | 56f9b5ba53e0f51158eb73af65032cd84eff83d3 /git-pull.sh | |
| parent | Merge branch 'pt/pull-ff-vs-merge-ff' into maint (diff) | |
| parent | pull: handle --log=<n> (diff) | |
| download | tgif-4cb9fe35c015c576177d6a0ce096c935876544fc.tar.xz | |
Merge branch 'pt/pull-log-n' into maint
"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 09f6beabdc..47d89c1fc7 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -84,8 +84,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) |