1. 07 Oct, 2011 1 commit
    • Junio C Hamano's avatar
      fmt-merge-msg: use branch.$name.description · 898eacd8
      Junio C Hamano authored
      This teaches "merge --log" and fmt-merge-msg to use branch description
      information when merging a local topic branch into the mainline. The
      description goes between the branch name label and the list of commit
      titles.
      
      The refactoring to share the common configuration parsing between
      merge and fmt-merge-msg needs to be made into a separate patch.
      Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
      898eacd8