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 Halstrick
a
dd fsTick() to Repos
i
tor
y
TestCase
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-08-04
C
hri
s
tian H
a
lstrick
add more control to ind
e
xStat
e
() return-va
l
ue
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-08-03
Ch
r
isti
a
n
H
alstrick
M
e
rg
e
"Fixed FileTreeIterato
r
Wi
t
h
T
imeControl"
commit
|
commitdiff
|
tree
2010-07-29
C
h
ristian Halstrick
Make use of Repository
.
writeMerge
.
.
.
()
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Ch
r
i
stian
Hals
t
ri
c
k
Merge
"Fix tag sort
i
ng in PlotWalk"
commit
|
commitdiff
|
tree
2010-07-28
Ch
r
istian Halst
r
ick
Add
t
est
s
for racy git / Index state
encod
i
ng
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Christi
a
n Halstrick
Fix unit tests under windows
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-28
Christian Halstrick
Teac
h
Na
m
eConflict
T
reeWalk to r
e
port DF conf
l
i
c
ts
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-27
Christian Halstrick
Ad
d
m
e
thods which write MERGE_HEAD
a
nd
M
ERGE_MSG
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-20
Ch
r
istian
Halstrick
Check for
r
acy git in Work
i
ngTreeIt
e
rator
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-20
Christian Halst
r
ick
Smudge ra
c
ily
clean
i
ndex e
n
trie
s
by
t
runcating length
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-16
Christian Halstri
c
k
Add
e
d dirty-detection to Worki
n
gTree
I
t
erator
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-13
Christian
H
a
l
strick
Fix ReadTreeTest
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-07-09
Christian Halst
r
ick
M
e
rge "Al
l
ow ReadTreeTe
s
t
to
t
est arbitrary
C
h
eck
o
ut
s
"
commit
|
commitdiff
|
tree
2010-07-08
Chr
i
st
i
an Hals
t
r
ick
Allo
w
ReadTreeTes
t
to test arbitrary C
h
eckouts
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-06-04
Christian H
a
lstrick
Refactor ReadT
r
e
e
T
est to a
l
low testing oth
e
r
ch
e
ckout
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-20
Christian Halstric
k
A
d
d
ed
m
erge support to
CommitComma
n
d
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-12
Chri
s
ti
a
n
H
a
lstr
i
c
k
Add
c
ommit comman
d
to
t
he pg
m
pa
c
k
a
ge
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-10
C
hristian
Ha
l
st
r
ick
Add builder-style API to jgit and Co
m
mit
&
Log
cmd
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-05-08
C
h
ri
s
tian Halstrick
Added MERG
I
NG_RESO
L
VED repository sta
t
e
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-02-02
Chris
t
ian Halstrick
Fix
.
cl
a
sspath
to make jgit easily r
u
nna
b
le
f
r
o
m inside
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2010-01-06
Christian Halstrick
Ad
d
f
i
le content merge algorit
h
m
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-11-04
C
h
ri
s
t
ian Halstrick
Add p
e
rformance tests for
M
yers
D
iff
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-09
Christ
i
an
H
a
l
strick
Add javadoc
comments, remove unused code
,
s
h
ift co
m
ments
.
.
.
commit
|
commitdiff
|
tree
2009-10-08
Chr
i
stian Hals
t
r
ick
F
i
x
ed MyersDiff to be able t
o
hand
l
e
mor
e
than 100k
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-07
Christian Halstrick
Fix
some warnings regarding
u
n
necessary imports and
.
.
.
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree
2009-10-02
Christian Halst
r
ick
Add
sup
p
o
rt for logAllRe
f
U
p
d
a
tes con
f
iguration parameter
Signed-off-by:
Christian Halstrick
<christian.halstrick@sap.com>
commit
|
commitdiff
|
tree