summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Ward Vandewege [Thu, 5 Jun 2014 18:25:47 +0000 (14:25 -0400)]
A few fixes:
a) clarify error message when doing a fast-forward merge rejection
b) reduce number of gratuitous newlines
c) do not test for issue numbers when a fast-forward merge is being
attempted, because that test will complain about every commit, obscuring
the real problem (the fast-forward merge)
Ward Vandewege [Thu, 5 Jun 2014 17:52:39 +0000 (13:52 -0400)]
Merge branch 'new-git-hooks' of git.curoverse.com:arvados-dev into new-git-hooks
Peter Amstutz [Thu, 5 Jun 2014 15:43:26 +0000 (11:43 -0400)]
Added mention of git reset to instructions for remerging/rebasing.
Peter Amstutz [Thu, 5 Jun 2014 15:41:22 +0000 (11:41 -0400)]
Disallow commits that merge local and remote master, in order to maintain
linear history of master.
Peter Amstutz [Thu, 5 Jun 2014 15:26:01 +0000 (11:26 -0400)]
Added pattern to permit commits that merge master heads.
Peter Amstutz [Thu, 5 Jun 2014 15:09:54 +0000 (11:09 -0400)]
Proposed new git hook policy: only applies to first-parent, enforces master is
first parent on all merges, enforces issue number (or explicitly stating no
issue number) on all master commits.
Ward Vandewege [Wed, 4 Jun 2014 20:33:10 +0000 (16:33 -0400)]
Build crunchstat package.
Ward Vandewege [Tue, 3 Jun 2014 15:25:10 +0000 (11:25 -0400)]
Initial commit of the scripts used in our Jenkins pipelines.
Ward Vandewege [Wed, 28 May 2014 16:01:16 +0000 (12:01 -0400)]
Only check master, because bad things happen otherwise.
Ward Vandewege [Wed, 28 May 2014 15:45:43 +0000 (11:45 -0400)]
Coding standards hook, initial commit.
projects / arvados-dev.git / log