repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
format-patch: Remove last vestiges of --mbox option
2006-02-02
Fr
e
d
r
ik Kui
v
inen
me
r
ge-
r
ecursi
v
e
:
S
pe
e
d
up com
m
i
t
graph constr
u
c
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edrik Kuivinen
merge-r
e
c
u
rsive:
Make u
s
e
of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Kuivinen
g
i
t
-
branc
h
:
D
o
c
umenta
t
ion fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
edrik Kuivinen
m
erge-recursive: Im
p
rove the error message pr
i
nt
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-
w
h
a
t
changed: Add usa
g
e
s
trin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
vinen
git-lo
g
: Add
u
sage stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
ui
v
inen
git-dif
f
: U
s
age
s
tring cl
e
an-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kui
v
inen
Usag
e
mess
a
ge clea
n
-u
p
, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuiv
i
nen
New test case:
C
riss-cross me
r
ge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New test case
:
me
r
g
e
with
directory/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
dr
i
k Kuivinen
t
es
t
-
l
ib
.
sh: Add new function, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
d
r
i
k
Kuivinen
git-merge:
E
xit
w
ith co
d
e 2 if no st
r
at
e
gy was
a
ble
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redrik Kuivi
n
e
n
merge-recursive: Replac
e
'
excep
t
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
m
erge-recu
r
sive: Use
'
~' instead of '_'
to
s
ep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
me
r
ge-recu
r
s
i
ve: Add
c
op
y
right noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivinen
m
erge-r
e
cursive
:
I
ndent t
h
e output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-r
e
cursive: Fix su
p
port for branch
n
am
e
s con
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik
Kuivinen
me
r
ge-re
c
urs
i
v
e
: Fix limited o
u
tput of
r
e
n
a
m
e messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik
K
uivinen
me
r
g
e
-rec
u
r
sive: Only
p
rint
r
elevant rename
m
essag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kuivinen
[PAT
C
H]
E
nable and fix support for base le
s
s merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
r
ik Kuivinen
[PATCH]
T
e
a
c
h
git-
l
s-files abo
u
t
'
--'
t
o
d
enote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATCH] Teach the recursive
m
erge strategy abo
u
t r
e
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
ivinen
[PAT
C
H]
M
o
r
e
d
escrip
t
i
ve me
s
sa
g
es
f
o
r conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kui
v
inen
[PATCH] recursive-m
e
rge: D
o
n't
p
r
int a st
a
c
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik
Kuivinen
[PATCH] U
s
e the 'die' functi
o
n wh
e
r
e
i
t is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Ku
i
vine
n
[PAT
C
H] Use a te
m
porary
i
ndex file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PA
T
CH] Ad
j
u
st gi
t
-mer
g
e-recurs
i
ve
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Don'
t
o
u
t
put
'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivin
e
n
[
P
ATCH] Be mo
r
e like the 'resolve
'
stra
t
egy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Kuivinen
[P
A
T
C
H] Rename the 'fredri
k
' merge strateg
y
to 'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vine
n
[PATCH] Make the Progra
m
Error class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik K
u
ivi
n
en
[PATCH]
Make s
u
re
we die if we do
n
't get enou
g
h argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uiv
i
nen
[PA
T
CH] Introduc
e
a
'
d
ie' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivine
n
[PA
T
CH] Exit
w
ith
s
tatus
c
ode 2 if
we get
an exc
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH
]
Fix
ass
e
rt
i
on
fail
u
re
w
hen
m
e
r
ging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
e
d
rik Kuivine
n
[PA
T
CH
]
Make git-apply understan
d
i
nc
o
mplet
e
li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree