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 H
a
lstrick
add fsTick()
t
o RepositoryTestCase
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-08-04
Christian Halstrick
add more con
t
rol to indexState(
)
return-val
u
e
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-08-03
C
hristian Hal
s
t
r
i
ck
M
e
rge "Fixed Fil
e
TreeIte
r
atorWit
h
T
imeControl"
commit
|
commitdiff
|
tree
2010-07-29
C
h
ristian
H
alstrick
Make us
e
of Rep
o
sito
r
y
.
writeMerg
e
.
.
.
(
)
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Ch
r
istian Halstrick
Merge
"
Fi
x
tag sorting
in Plot
W
a
lk"
commit
|
commitdiff
|
tree
2010-07-28
C
h
ristian Halstri
c
k
Add test
s
for racy gi
t
/ Index sta
t
e enc
o
ding
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Christia
n
Halstrick
Fix
un
i
t tests under windo
w
s
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Christian
H
alst
r
i
ck
T
e
a
ch NameConf
l
i
ctTre
e
Walk to report DF
conflicts
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-27
Christi
a
n H
a
lstr
i
ck
Add meth
o
ds wh
i
ch write MERGE_HEAD a
n
d
MERGE_MSG
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-20
Chr
i
s
t
i
a
n Hals
t
rick
Check for racy git in WorkingTreeIte
r
a
t
or
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-20
Chr
i
s
t
ian
Ha
l
stric
k
S
m
udge
racily
clean index ent
r
ies by truncating
l
ength
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-16
C
h
r
i
stian Halstrick
A
dde
d
d
i
rty-
d
etection
to WorkingTreeI
t
e
r
ator
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-13
Ch
r
ist
i
an H
a
lstrick
Fix ReadTreeTest
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-09
Chr
i
stian Ha
l
strick
Merg
e
"
Allow Re
a
d
TreeTes
t
t
o
test arbitrary C
h
eckout
s
"
commit
|
commitdiff
|
tree
2010-07-08
Chri
s
ti
a
n
Halstrick
Allow
R
e
adTreeTest to test arbitrary Checkout
s
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-06-04
Christian H
a
lstrick
Refactor ReadT
r
eeTest to allow
te
s
ting other
c
h
e
ckout
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-20
Christi
a
n Halstrick
A
d
ded me
r
ge s
u
p
por
t
t
o
CommitCo
m
m
and
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-12
Chr
i
s
tian Halst
r
ick
Add
c
ommit command to the p
g
m
p
a
ckage
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-10
Christi
a
n Halstrick
Add buil
d
er-s
t
yl
e
API to jgit
and Co
m
mit &
L
og
c
md
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-08
Chris
t
ian Halstr
i
ck
A
d
ded MERGING
_
RESO
L
V
ED repo
s
itory state
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-02-02
Christian Halstrick
Fi
x
.
clas
s
path to ma
k
e jgit easily runnable from inside
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-01-06
Christian Halstrick
Add file conten
t
merge algorithm
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-11-04
Ch
r
i
s
tian
Hals
t
ri
c
k
A
d
d
p
e
rfor
m
a
n
ce tests for MyersDiff
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-09
Christi
a
n H
a
lstrick
Add javadoc comments, remove unused c
o
de, sh
i
f
t
comments
.
.
.
commit
|
commitdiff
|
tree
2009-10-08
Christian Hal
s
trick
F
i
x
e
d MyersD
i
ff to be able to h
a
ndle more than 1
0
0k
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-07
Christian
H
alstrick
Fix some w
a
rnin
g
s re
g
arding unn
e
cessary imports and
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-02
C
hrist
i
an Halstrick
A
dd supp
o
rt for logAllRefUpda
t
es configuration par
a
meter
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree