diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-05-18 09:30:26 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-05-21 21:03:42 +0200 |
| commit | 4a1673288413962bcb5be8ae0a2280401a02f143 (patch) | |
| tree | ad0421726c629bb3011711b3406656e0cc4be794 | |
| parent | a0e829ceae208d82e990f6ce8303011ed3550dd9 (diff) | |
dim: Don't fast-forward in apply-pull
Obvious oversight.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rwxr-xr-x | dim | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -945,7 +945,7 @@ function dim_apply_pull checkpatch_commit_push_range "HEAD..FETCH_HEAD" - if ! $DRY git pull $pull_branch ; then + if ! $DRY git pull --no-ff $pull_branch ; then if ! check_conflicts "$pull_branch" ; then echoerr "Please resolve and then commit normally using git" |