diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-04-30 15:04:26 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-05-23 14:31:31 +0200 |
| commit | 186bf39a47bb56a4b6def7022a8841dccdb1ee8c (patch) | |
| tree | 40c40dc8c7d9a3b7cf6349b8a32f990f13bfdd4b | |
| parent | c19a79d5f5666bd33fe456927e04750efb807e28 (diff) | |
dim: exclude commits from subordinate trees in pull-request
For trees which integrate other trees it's a bit much to show all the
commits pulled in through those other trees - that should all be
summarized already in the merge commit.
Instead only show commits done in the local tree, whether that's
merges or normal commits. --first-parent achieves that.
Cc: Dave Airlie <airlied@gmail.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rwxr-xr-x | dim | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1764,7 +1764,7 @@ function dim_update_next $DRY git add drivers/gpu/drm/i915/i915_drv.h git commit $DRY_RUN -sm "drm/i915: Update DRIVER_DATE to $driver_date" - gitk drm-intel-next-queued ^$(repo_to_remote drm-upstream)/drm-next & + gitk --first-parent drm-intel-next-queued ^$(repo_to_remote drm-upstream)/drm-next & # try to push dinq first in case someone raced FORCE=1 dim_push_queued @@ -1864,7 +1864,7 @@ function dim_pull_request repo="drm-intel" else tag=$(tag_name "$branch") - gitk "$branch" ^$upstream & + gitk --first-parent "$branch" ^$upstream & tag_branch $tag $branch $DRY git push $remote $tag prep_pull_mail $req_file $tag |