diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-22 21:38:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-22 21:38:50 -0700 |
| commit | aeb2aaa7712f7af8237d5bceb725a7db8c2d4620 (patch) | |
| tree | 179be08e021c12d073818ca78bc63846b10da8a5 /git-svn.perl | |
| parent | 281ee1d0c2c3f73bdc9012a5ac52feff97f72acd (diff) | |
| parent | b1b47554ae889ca76b66349819c9b95a8be5f646 (diff) | |
| download | git-aeb2aaa7712f7af8237d5bceb725a7db8c2d4620.tar.gz | |
Merge branch 'mg/rev-list-one-side-only'
* mg/rev-list-one-side-only:
git-log: put space after commit mark
t6007: test rev-list --cherry
log --cherry: a synonym
rev-list: documentation and test for --cherry-mark
revision.c: introduce --cherry-mark
rev-list/log: factor out revision mark generation
rev-list: --left/right-only are mutually exclusive
rev-list: documentation and test for --left/right-only
t6007: Make sure we test --cherry-pick
revlist.c: introduce --left/right-only for unsymmetric picking
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index 177dd259cd..a5857c1ad4 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -5734,7 +5734,7 @@ sub cmd_show_log { my (@k, $c, $d, $stat); my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/; while (<$log>) { - if (/^${esc_color}commit -?($::sha1_short)/o) { + if (/^${esc_color}commit (- )?($::sha1_short)/o) { my $cmt = $1; if ($c && cmt_showable($c) && $c->{r} != $r_last) { $r_last = $c->{r}; |