pmr

~cjwatson/pmr:better-git-authorship

  1. Git
  2. lp:~cjwatson/pmr
  3. better-git-authorship
Last commit made on 2016-11-08
Get this branch:
git clone -b better-git-authorship https://git.launchpad.net/~cjwatson/pmr
Only Colin Watson can upload to this branch. If you are Colin Watson please log in for upload directions.

Branch merges

Branch information

Name:
better-git-authorship
Repository:
lp:~cjwatson/pmr

Recent commits

47e236c... by Colin Watson

Improve authorship of git merges

Rather than allowing all merge commits to appear to be authored by the
pmr operator, which produces unhelpful output in git log, show the merge
as being authored by the author of the most recent commit in the merged
branch.

c52ee7d... by Colin Watson

Refine git commit messages further

This moves the commit message provided by the user to the start, which
means it will show up more prominently in cgit and the like. The extra
information added by pmr is still present in git-idiomatic key/value
pairs at the end, and it'll be easier to extend if we want to add other
things there later.

21982ef... by Shawn Wang

Merge #310165 from ~shawn111/pmr:one-shot

d133b51... by Shawn Wang

a few style tweaks.

1061013... by Shawn Wang

move one_shot option into merge_mergable_on_project

58d1ef6... by Shawn Wang

add one-shot option

1240ef2... by Thomi Richards

Don't merge if tests fail.

6bed5fe... by Colin Watson

Produce nicer git commit messages

This avoids ugly "Merge commit '<hash>' into <merge-id>" messages, and
causes the commit_message field on merge proposals to mean something.
We now always create a merge commit, and construct a commit message that
includes the merge proposal ID, a shortened version of the repository
and path that match the titles of merge proposals in the Launchpad web
UI, and the commit_message field from the merge proposal. For example,
one might end up with:

  Merge #300000 from ~contributor/project:branch

  Rotate weasels instead of stoats

  Stoats object to being rotated, so rotate weasels instead. Unless
  otherwise specified, mustelid-rotation is through 180 degrees.

15192e6... by Stuart Bishop

Merge remote-tracking branch 'upstream/master'

b2a1cae... by Stuart Bishop

Do not push merge if tests fail (lp:1612514)