repo.or.cz
/
jgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge changes I39bfefee,I47795987,I70d120fb,I58cc5e01,I96bee7b9
2010-08-04
Christian Ha
l
strick
add fsT
i
ck() to RepositoryTestCase
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-08-04
Christian Halstrick
ad
d
more control to indexState() return-value
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-08-03
Christian Halstrick
Merge "Fixed FileTreeIteratorWithTimeCo
n
trol"
commit
|
commitdiff
|
tree
2010-07-29
C
hri
s
tian Halstrick
M
ake use
o
f Repos
i
tory
.
wri
t
eMerge
.
.
.
(
)
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Chri
s
tian
H
a
l
str
i
ck
Merge "Fix tag sorting in PlotWalk"
commit
|
commitdiff
|
tree
2010-07-28
Christian Halstri
c
k
Ad
d
tests for racy git / In
d
ex stat
e
enc
o
ding
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Christian Halstrick
Fix unit tests under windows
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Chr
i
stia
n
Halstrick
T
e
a
ch N
a
meConflictTre
e
Walk to r
e
port D
F
conflicts
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-27
Christian Halstrick
A
dd met
h
ods whic
h
write
M
ERGE_HEAD and M
E
RG
E
_MSG
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-20
Christian Halstrick
Ch
e
ck for racy git i
n
WorkingTreeIterator
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-20
Ch
r
istian H
a
lstrick
S
mudge racily cle
a
n index entrie
s
by truncating len
g
th
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-16
Ch
r
is
t
ian Ha
l
s
t
r
ick
Added dirty-det
e
c
t
ion to WorkingTreeItera
t
or
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-13
Christian H
a
ls
t
r
ic
k
Fix Rea
d
Tre
e
Test
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-09
Christian
Halstrick
Merge
"
Allow ReadTr
e
eTest to test arbitrar
y
Checkouts
"
commit
|
commitdiff
|
tree
2010-07-08
Christi
a
n Halstrick
Allow ReadT
r
eeTest to te
s
t arbit
r
a
r
y Checkouts
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-06-04
Ch
r
is
t
ian Hals
t
rick
Refactor ReadTreeTest to all
o
w testi
n
g
o
ther checko
u
t
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-20
C
h
ri
s
tian Halst
r
i
ck
A
dded merge support to CommitComm
a
nd
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-12
Chr
i
stian Halst
r
ick
Add
com
m
it
c
ommand to the
pgm pack
a
ge
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-10
C
h
ristian Halstrick
Add b
u
ilder-st
y
le API to jgit
a
nd Commit & Log cmd
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-08
Christ
i
an Halstr
i
ck
Added MERGING_RESOLVED repo
s
i
t
ory s
t
a
te
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-02-02
Chr
i
st
i
an Halstrick
F
ix
.
cl
a
s
s
p
at
h
to make jgit easily runnable
f
r
om
i
nside
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-01-06
Christian Halstrick
Add fil
e
c
o
nten
t
m
erge
a
lg
o
ri
t
hm
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-11-04
Christian Halst
r
i
ck
Add pe
r
form
a
nce
te
s
t
s f
o
r MyersDiff
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-09
Christia
n
H
a
lstrick
A
d
d javadoc
c
omment
s
, r
e
move un
u
sed
c
ode, shift comm
e
nts
.
.
.
commit
|
commitdiff
|
tree
2009-10-08
C
hristian
Ha
l
s
t
r
i
c
k
Fixe
d
MyersDi
f
f to
b
e able
to
handle more th
a
n 10
0
k
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-07
Ch
r
istian Halst
r
i
ck
F
ix
s
o
me warnings regar
d
ing u
n
necessary impo
r
ts a
n
d
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-02
C
hristia
n
Halstrick
Add support for logAllRe
f
Updates con
f
iguration parameter
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree