Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 | 1 | -1/+1 |
* | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 1 | -1/+1 |
* | t7604-merge-custom-message: show that --log doesn't append to -m | Tay Ray Chuan | 2010-05-10 | 1 | -0/+12 |
* | t7604-merge-custom-message: shift expected output creation | Tay Ray Chuan | 2010-05-10 | 1 | -4/+8 |
* | merge: do not add standard message when message is given with -m option | Junio C Hamano | 2009-12-02 | 1 | -5/+2 |
* | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 1 | -1/+1 |
* | Add new test case to ensure git-merge prepends the custom merge message | Miklos Vajna | 2008-07-06 | 1 | -0/+37 |