repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout: fix dirty-file display.
2006-02-14
Fredri
k
Kuiv
i
nen
s
/SHELL/SHEL
L
_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edri
k
Kuivinen
merge
-
recursive: Speed
u
p com
m
it
gr
a
ph cons
t
ru
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
u
ivinen
merge-recursive: Make use of
provide
d
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
inen
git
-
branch: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
merge
-
recurs
i
ve: Im
p
rove the error m
e
ssage printe
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivine
n
git-whatchang
e
d: A
d
d
u
sage
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
i
k
K
u
ivinen
git
-
log: Add
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-diff: U
s
age string c
l
ean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
drik Kuivi
n
en
U
sage messag
e
clean-u
p
,
t
ake #
2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
N
e
w test case:
Criss-
c
ross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
New tes
t
case: mer
g
e w
i
th
dire
c
tory/fi
l
e confl
i
cts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivinen
test-lib
.
s
h: Add new function, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-me
r
ge: Exit with co
d
e 2 if n
o
strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredri
k
Kuivinen
mer
g
e
-
recursive:
Repl
a
ce 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
m
e
rge
-
re
c
ursiv
e
: Use '~' instead of '_'
t
o
s
e
parate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kuivinen
merge
-
recursive: A
d
d
cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recur
s
ive: Inde
n
t
the outpu
t
p
r
op
e
rly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivine
n
merge-recu
r
sive: Fix sup
p
ort f
o
r branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
merge-recursive
:
Fix li
m
ited
o
u
t
put of rena
m
e messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
Kuivi
n
e
n
merg
e
-recurs
i
ve:
O
nly print releva
n
t
rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
rik Kuivine
n
[PATCH]
E
nable
a
nd fix suppor
t
for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
P
AT
C
H]
Teach git-ls-files about '--'
to den
o
te
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
dr
i
k Kuiv
i
nen
[PATCH] Teach the recursive
m
e
r
ge strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
Kuivi
n
en
[PATC
H
] M
o
r
e
descripti
v
e me
s
sages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
v
inen
[
P
ATC
H
] recur
s
ive-
m
erge:
D
o
n't prin
t
a st
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivinen
[PATCH] Use
t
he 'die' function where it is ap
p
ropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kui
v
inen
[PATCH] Use
a
temporary index file w
h
e
n
we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjus
t
git-merge-recursive
.
py for the new
t
ool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
dri
k
Kuivine
n
[PATCH] Do
n
't output 'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[P
A
TCH] Be
mor
e
like
the 'r
e
solve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATC
H
] Renam
e
the
'fredrik' merge s
t
rategy to '
r
e
c
ursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kui
v
i
n
en
[PATCH] Make
the Progra
m
Error clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PA
T
CH] Make sure
w
e die if
w
e don't ge
t
enough argument
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Ku
i
vinen
[P
A
TCH] Introd
u
ce a 'die' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
r
ik
K
uivinen
[PATC
H
] Exit with sta
t
us co
d
e 2 if we get an
e
xception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
P
ATCH] Fix assertion fail
u
re when merging commo
n
anc
e
stors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
re
d
ri
k
Kuivin
e
n
[PATCH] Make gi
t
-
a
p
p
ly understa
n
d incomplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree