Wireshark-commits: [Wireshark-commits] rev 54007: /trunk/tools/ /trunk/tools/: backport-change

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: gerald@xxxxxxxxxxxxx
Date: Fri, 13 Dec 2013 01:40:40 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54007

User: gerald
Date: 2013/12/13 01:40 AM

Log:
 Switch the cherry-pick merge strategy to "recursive + theirs", which
 seems to pull in fewer changes and be less prone to conflitcs. This was
 the case for r53086, at least.  Add "-x" which adds a "cherry picked
 from..." line to the commit message.
 
 Show a diff before pushing.

Directory: /trunk/tools/
  Changes    Path               Action
  +4 -1      backport-change    Modified