repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Pretty-print tagger dates.
2006-02-14
Fredrik
Ku
i
vinen
s
/
SHE
L
L/SHEL
L
_PAT
H
/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
dri
k
Kuivinen
merge-recursiv
e
:
Speed up commi
t
graph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
Kuiv
i
nen
merge-recur
s
ive: Make use of prov
i
ded bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredr
i
k Kuivinen
git-branch: Documentati
o
n fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fred
r
ik Kuivinen
m
e
r
g
e-recursive: Impr
o
ve
t
he error m
e
ssage
printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
d
r
ik Kuivi
n
en
git
-
w
hat
c
hang
e
d
:
Add
usa
g
e str
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik K
u
i
v
inen
git-log: Add usage strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivin
e
n
git-d
i
ff: Usage st
r
ing cle
a
n-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik K
u
i
v
inen
Usage messa
g
e clean-up, tak
e
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vine
n
New te
s
t case: Criss-
c
ro
s
s mer
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
New test cas
e
: merge with direct
o
ry/file conf
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivin
e
n
test-lib
.
sh: Ad
d
new funct
i
on,
te
s
t_ex
p
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
git-merge: Exit with code 2
if no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fre
d
r
ik Ku
i
vinen
merge-recu
r
s
i
ve
:
Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
en
me
r
g
e-recursive:
U
se '~' in
s
tead o
f
'
_
'
to
s
e
parate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivinen
merg
e
-recursive: Ad
d
copyri
g
ht notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redrik Kuivin
e
n
merge-r
e
curs
i
ve: Indent
t
he output prop
e
rly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuiv
i
ne
n
merg
e
-recu
r
s
i
ve:
F
ix support
for branch name
s
con
t
a
ining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivinen
merge-recursive:
Fix
limited out
p
ut of rename me
s
s
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik K
u
i
v
inen
merge-recursive:
O
nly prin
t
r
eleva
n
t rena
m
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kui
v
inen
[PAT
C
H] Enabl
e
a
nd fix support fo
r
base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
ivinen
[PATCH
]
T
ea
c
h git-ls-files
about
'
-
-' t
o
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
e
dr
i
k
Kuivinen
[PATC
H
] Te
a
ch
t
he recursive me
r
ge strateg
y
about
rena
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
ivine
n
[PATCH
]
M
o
re descriptive
messages for confl
i
ct cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recursiv
e
-merg
e
: Don't
p
rint a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH]
Use
t
he '
d
ie'
f
unct
i
on where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uiv
i
nen
[PATC
H
] U
s
e a
t
emporary ind
e
x f
i
le when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Ku
i
vin
e
n
[PATC
H
] Adjust git-merg
e
-
r
ecur
s
ive
.
p
y
for
th
e
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[P
A
TCH]
D
on't o
u
tput '
A
utomat
i
c
merge faile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
Kuivinen
[PATCH]
B
e more like the '
r
esolve' stra
t
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivi
n
en
[
PATCH] Renam
e
the 'fre
d
r
i
k'
m
erge strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH] Ma
k
e the
P
rogramE
r
r
o
r class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
iv
i
nen
[PA
T
CH] Make sure we di
e
i
f
w
e
don't get eno
u
g
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[
P
ATCH] Introduce a 'die' functi
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Kuivi
n
e
n
[PATCH]
Exit w
i
th st
a
tus code
2 if we
get an exce
p
ti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
Fix asser
t
i
o
n failu
r
e
w
hen m
e
rgi
n
g commo
n
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fre
d
rik Kuivinen
[PATC
H
] Make
g
it
-
apply und
e
rsta
n
d incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree