projects
/
Pman.MTrack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
abb0edb
)
Merger.php
author
Alan Knowles
<alan@akbkhome.com>
Tue, 6 Sep 2011 07:20:26 +0000
(15:20 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Tue, 6 Sep 2011 07:20:26 +0000
(15:20 +0800)
Merger.php
patch
|
blob
|
history
diff --git
a/Merger.php
b/Merger.php
index
47a18a8
..
83a579b
100644
(file)
--- a/
Merger.php
+++ b/
Merger.php
@@
-137,7
+137,7
@@
class Pman_MTrack_Merger extends Pman {
// in theory you could click a number of them and only merge those changes..
// need to do a git diff.. and just get a list of files..
- $rev = preg_replace('/[^a-z0-9]+/', '');
+ $rev = preg_replace('/[^a-z0-9]+/', ''
,$rev
);
$this->repo->debug = 1;
$fh = $this->repo->git('diff', "{$this->release}..{$rev}", '--', "");