Commit graph

3 commits

Author SHA1 Message Date
Nate Jensen
0c8a403b4c Issue #716 only print mergetool message if it's not set
Change-Id: I7a2e56e58dff3b6b2dcc65a734767d2c707882b8

Former-commit-id: d3d4109e09 [formerly 566280332f] [formerly 76382d8ccd] [formerly d3d4109e09 [formerly 566280332f] [formerly 76382d8ccd] [formerly 1e761b6716 [formerly 76382d8ccd [formerly d3e7ea521c17f091b37d07f877c728fdb616c4a9]]]]
Former-commit-id: 1e761b6716
Former-commit-id: 10c615009b [formerly fb7755cc04] [formerly 0a02e42361dc5d52e043e21e521eff50044aa590 [formerly 3fe0f03307]]
Former-commit-id: 60c8d4ad94278f8c85cea88777bbc659bf9a4024 [formerly 2226e17a80]
Former-commit-id: b3cce25243
2012-06-28 16:16:26 -05:00
Steve Harris
62c103b74e Issue #708 - execute permissions didn't survive the git push
Former-commit-id: 6c95a4db02 [formerly 4d2baf48d9] [formerly aa46aa3713] [formerly 6c95a4db02 [formerly 4d2baf48d9] [formerly aa46aa3713] [formerly a2c88aee12 [formerly aa46aa3713 [formerly 44388508c45f2c560301558c4fb297b806ba55a7]]]]
Former-commit-id: a2c88aee12
Former-commit-id: 7be273eeda [formerly 927fd978b4] [formerly 05e4bb28fa76f6cf166544e27f172c99b046f856 [formerly bc15e39e5e]]
Former-commit-id: 9cd06da6513a33a536d518472cc5cb70f222a0da [formerly a9dafc2233]
Former-commit-id: c2a1dd7f1b
2012-06-22 12:08:20 -05:00
Steve Harris
54713c63f3 Issue #708 - new script for setting up Gerrit hook and aliases
Change-Id: Iabdc5005ed9376e31414429a76898c0798d8e7ff

Former-commit-id: 0df9b2fa12 [formerly 48faf25841] [formerly 492e6fe379] [formerly 0df9b2fa12 [formerly 48faf25841] [formerly 492e6fe379] [formerly 209299d1cb [formerly 492e6fe379 [formerly ec3999181ac1f2d2d0ca7f469b69a5bf83633570]]]]
Former-commit-id: 209299d1cb
Former-commit-id: f0466f1c52 [formerly 09e2faee72] [formerly 1b1024c81933c1baa14f7f1635db43dc34a0b75e [formerly 2a31a4c3e9]]
Former-commit-id: a34c50947fec74d638c04a04b66b0c43b4f0017c [formerly a48615c40d]
Former-commit-id: 918766b587
2012-06-22 11:39:00 -05:00