diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:37:01 -0800 |
| commit | 1ee740e66975adbab080301ebd364e253be3d513 (patch) | |
| tree | 672932e73881b55204ec237b9047c8532d891a61 /git-pull.sh | |
| parent | ef87690b27fd1facdc8cc48f6789a930939303a3 (diff) | |
| parent | 6b37dff17f176d7e87efa93b4cf521dd725de247 (diff) | |
| download | git-1ee740e66975adbab080301ebd364e253be3d513.tar.gz | |
Merge branch 'ab/pull-rebase-config'
* ab/pull-rebase-config:
pull: introduce a pull.rebase option to enable --rebase
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh index 9868a0bfb4..d8b64d7a67 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -44,6 +44,10 @@ merge_args= curr_branch=$(git symbolic-ref -q HEAD) curr_branch_short="${curr_branch#refs/heads/}" rebase=$(git config --bool branch.$curr_branch_short.rebase) +if test -z "$rebase" +then + rebase=$(git config --bool pull.rebase) +fi dry_run= while : do |