| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | git-svn: Teach dcommit --mergeinfo to handle multiple lines | Bryan Jacobs | 2011-09-01 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | "svn dcommit --mergeinfo" replaces the svn:mergeinfo property in an upstream SVN repository with the given text. The svn:mergeinfo property may contain commits originating on multiple branches, separated by newlines. Cause space characters in the mergeinfo to be replaced by newlines, allowing a user to create history representing multiple branches being merged into one. Update the corresponding documentation and add a test for the new functionality. Signed-off-by: Bryan Jacobs <bjacobs@woti.com> Acked-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> | ||||
| * | tests: flip executable bit on t9158 | Jeff King | 2010-12-13 | 1 | -0/+0 |
| | | | | | | | | All tests are supposed to be executable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||||
| * | git-svn: allow the mergeinfo property to be set | Steven Walter | 2010-12-10 | 1 | -0/+41 |
| As a first step towards preserving merges across dcommit, we need a mechanism to update the svn:mergeinfo property. [ew: fixed bashism and style issues in test case] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | |||||
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |