repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
avoid echo -e, there are systems where it does not work
2006-02-02
Fredrik K
u
i
vinen
merge-recurs
i
v
e:
Speed up commit graph c
o
n
stru
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredri
k
Kuivinen
merge-r
e
cursive
:
M
a
ke use of p
r
ovided b
a
ses
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-b
r
a
nch: Documenta
t
ion f
i
xes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredri
k
Kuivinen
merge-recu
r
sive: Improve th
e
error m
e
ssage pr
i
nted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-
w
hatchanged: Add
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik Kuivinen
git-log: Add usa
g
e s
t
rin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-diff: Usage stri
n
g
cl
e
a
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage message
cl
e
an-up, t
a
k
e
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test
c
a
se: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
re
d
r
i
k Kuivinen
New test c
a
se: merge w
i
th directory/fil
e
conflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivine
n
t
e
st-lib
.
sh: Add n
e
w
function
,
test_expec
t
_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivine
n
g
it-merge: E
x
it
w
i
th
c
ode 2
if
no strategy was abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
edrik K
u
ivinen
merge
-
re
c
ursive: Replace 'exce
p
t:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
e
n
m
erge-rec
u
rsiv
e
: Use '~' instead of '_' t
o
separ
a
te
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
iv
i
nen
m
erge
-
recursive: A
d
d copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
r
i
k
Kui
v
i
ne
n
mer
g
e-re
c
ursive: Indent the output
p
roperly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Kuivi
n
e
n
m
erge-re
c
u
r
sive: Fix suppor
t
for bran
c
h names co
n
tai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
K
u
ivine
n
merge-recu
r
si
v
e:
F
ix limite
d
o
u
tput
o
f rename me
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik
K
uivinen
mer
g
e-
r
ecursiv
e
: Only
pr
i
nt re
l
evant r
e
name
m
essages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[P
A
TCH]
Enable a
n
d fix support
f
or
b
ase l
e
ss merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach g
i
t-ls
-
f
i
les ab
o
ut
'--'
t
o denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
ivinen
[PATC
H
] Teach the recursive merge stra
t
egy about re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivin
e
n
[P
A
TCH] More descr
i
ptive message
s
for conflict c
a
s
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PAT
C
H
]
recur
s
i
v
e-
m
erge: Don't print
a
stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
ik K
u
ivin
e
n
[P
A
TCH] Use the 'die' functio
n
w
h
ere i
t
is approp
r
iate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivi
n
en
[
P
ATCH
]
Use
a
temporary index
f
ile
when w
e
m
e
rge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git-merge-recur
s
ive
.
py for
t
he new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[
PATCH] Don't
output 'Automati
c
m
e
rge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be
m
ore l
i
ke the
'
resol
v
e' strat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Renam
e
th
e
'fredrik' merge str
a
teg
y
t
o 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Make t
h
e Progr
a
mError class pr
i
ntable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
red
r
i
k
K
uivinen
[
PATCH] M
a
ke sur
e
we die
if we d
o
n
'
t get enoug
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
r
ik Kuivinen
[PATCH] Introduce a 'd
i
e
' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PAT
C
H]
Exit with status code 2 if
we
get
a
n
exceptio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
ed
r
ik Kuivinen
[PATCH] Fix ass
e
r
tion failure w
h
en mer
g
ing comm
o
n ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Ku
i
vinen
[PATCH] Make git-ap
p
ly
u
ndersta
n
d
i
n
complete
l
i
ne
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree