repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
ls-tree: work from subdirectory.
2005-11-20
Fredrik K
u
ivin
e
n
merge
-
recur
s
i
v
e: Re
p
lace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
Ku
i
v
i
n
e
n
merge-recursive: U
s
e '
~
' in
s
tead o
f
'
_'
t
o
sep
a
ra
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
e
rge-r
e
curs
i
ve: Add co
p
y
right n
o
ti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redri
k
Kuivine
n
merge-recursive
:
Indent the output
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
ed
r
i
k
K
u
i
vi
n
en
merge-recursi
v
e: Fix su
p
port
f
or branch names cont
a
ining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vine
n
m
e
rge-rec
u
rsive:
Fix limited ou
t
pu
t
of rename mes
s
ages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edr
i
k Kuivinen
merge-recursive:
O
n
ly print relevant rename me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uivinen
[
PATCH] Ena
b
le and fix suppor
t
for bas
e
les
s
me
r
g
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuiv
i
n
en
[PATCH] Teach
g
i
t-
l
s-files about
'--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fred
r
ik K
u
ivinen
[PATCH
]
Teac
h
the recursive mer
g
e strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
red
r
ik Ku
i
vine
n
[P
A
TC
H
] M
o
r
e descri
p
tive
messa
g
es for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[
P
ATCH]
r
ecurs
i
ve-merge: Don't prin
t
a
s
tack
t
race
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Use the 'die' fun
c
tio
n
where it is approp
r
iate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivin
e
n
[PATCH] Use
a
t
emporary index file when we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivi
n
en
[PATCH] Adjust git-me
r
ge-re
c
ursive
.
py for the new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik
K
u
ivin
e
n
[
P
ATCH]
D
on't output 'Au
t
omat
i
c merge
f
ailed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kui
v
inen
[PATCH] B
e
m
o
re
like the 'resolve' st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[P
A
TCH]
R
e
n
ame
t
h
e 'fr
e
d
ri
k
' merge strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make t
h
e
P
ro
g
ramE
r
ror class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kui
v
inen
[PA
T
CH] Make
s
ure we
d
i
e if we don
'
t get en
o
ugh argumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH] Int
r
o
d
u
c
e
a
'
die'
f
u
nct
i
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Exit with status code 2 if we ge
t
an excepti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Ku
i
vinen
[PATC
H
] Fix assertion failure wh
e
n merging common
ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
Kuivinen
[PATCH] Make
g
it-apply
u
nderstand incomp
l
ete
li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree