Why not use the options on git-merge? > --log > --no-log > In addition to branch names, populate the log message with one-line > descriptions from the actual commits that are being merged. > > With --no-log do not list one-line descriptions from the actual commits being > merged.
Probably not a big deal, but I like being able to see the correspondence between branch names and tickets. Travis On Aug 26, 2010, at 4:27 AM, Invenio Trac wrote: > #260: "import magic" should be tested more thoroughly > ------------------------+--------------------------------------------------- > Reporter: bthiell | Owner: bthiell > Type: defect | Status: closed > Priority: minor | Milestone: > Component: *general* | Version: > Resolution: fixed | Keywords: > ------------------------+--------------------------------------------------- > > Comment (by simko): > > Committed, thanks. > > WRT commit log messages, please don't forget to add things like > `closes #260` or `addresses #260` so that the auto-closure works, see > [[https://twiki.cern.ch/twiki/bin/view/CDS/GitWorkflow#R1_Remarks_on_Git_log_messages]]. > (Otherwise I'm adding them, but it is nicer/quicker if you do.) > > WRT personal branch names, they may occasionally appear in the repo > history, if things are merged and not cherry-picked. So, generally > speaking, please use something more descriptive than the sole Trac > ticket number. This will make the repo to be nicely usable in the > offline mode: one does not always have online access to Trac, and the > ticket number appears in the commit log message anyway. > > -- > Ticket URL: <http://invenio-software.org/ticket/260#comment:4> > Invenio <http://invenio-software.org> > Travis C. Brooks Manager of Information Systems & SPIRES/INSPIRE SLAC National Accelerator Laboratory Library http://www.slac.stanford.edu/spires/
