repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-revert: Usage string clean-up
2005-12-14
freku045@studen
t
.
.
.
g
i
t-r
e
vert: Usage string cle
a
n-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku045@stu
d
ent
.
.
.
g
i
t-verify-tag:
U
sage
s
t
ring c
l
ean-
u
p, emit usage string
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku04
5
@stu
d
ent
.
.
.
Trivial usage str
i
ng clea
n
-
u
p
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
Fred
r
ik Kuivinen
Us
a
ge message
clea
n
-up, take #
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
ew t
e
st c
a
se:
Criss-cross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test c
a
se: mer
g
e w
i
th directory/file conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
t
est-lib
.
sh: A
d
d new function, test_e
x
pect_code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
rik Kuivinen
git-
m
erge: Exit w
i
th code 2 if
n
o strategy
was abl
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuiv
i
nen
mer
g
e-recur
s
ive: Repl
a
ce 'except:
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Use '~' inste
a
d of '_'
to separat
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Ku
i
vinen
merge-recursive: Add copy
r
ight not
i
c
e
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
iv
i
n
e
n
merge-recursiv
e
: Indent the
output prope
r
l
y
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik
K
uivinen
m
e
r
ge-recursive: Fix
support for branch names containing
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix limited out
p
ut of rena
m
e m
e
ssa
g
es
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-recu
r
sive: Only print relevan
t
re
n
ame messages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[
PATCH] Enabl
e
a
n
d fix
s
up
p
ort f
o
r
base less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
d
rik Kuiv
i
nen
[
PATCH]
T
each git-ls-f
i
les abou
t
'--' to
denote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuiv
i
n
en
[
PATCH] Te
a
ch the r
e
cursive merge strategy
a
bou
t
rena
m
es
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivine
n
[PAT
C
H] M
o
re d
e
scriptive m
e
ssages for conf
l
ict c
a
ses
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivinen
[P
A
TCH]
r
ecu
r
sive-me
r
g
e:
D
o
n't print a s
t
ack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[P
A
TCH] Use the '
d
ie' f
u
nction where it is appropriat
e
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivi
n
e
n
[PATCH] Us
e
a temporary in
d
e
x file when we me
r
ge the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH]
A
d
j
u
st git
-
m
e
rge-recursi
v
e
.
py fo
r
the new tool
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[P
A
TCH] Don't
o
u
tpu
t
'Au
t
omatic merge failed,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
inen
[PAT
C
H] Be more like the 'resolve'
s
trategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
ik Kuivinen
[PAT
C
H
]
Rename
t
he 'fredr
i
k' mer
g
e strategy t
o
're
c
ursiv
e
'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kui
v
inen
[PATCH] Make
th
e
ProgramError class printable
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PAT
C
H] Ma
k
e sur
e
we die if we don't ge
t
enough
a
rgum
e
nts
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
K
uivinen
[PATCH] Introd
u
ce
a 'die
'
f
u
nction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
rik Kuivin
e
n
[PATCH] Exit with status co
d
e
2
if we get an exception
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
K
u
i
vinen
[PATCH] Fix assertion fai
l
u
re wh
e
n m
e
rging
c
ommon
a
nce
s
tors
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
u
i
vinen
[PAT
C
H] Make g
i
t
-apply unders
t
and incomplete lines
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree