repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: typos and small fixes in "everyday".
2005-12-16
Fr
e
drik
K
uivi
n
en
git-what
c
ha
n
g
ed: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
re
d
rik
Kuivinen
git-log: Add us
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Ku
i
vinen
g
it
-
diff: Usage
s
t
r
i
n
g
c
lean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik
Kuivi
n
en
Usage message clean-u
p
,
take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New test
c
ase: Criss-cross
merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Ku
i
v
i
n
e
n
New
test
c
ase: merge with d
i
rector
y
/fi
l
e co
n
flicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivin
e
n
test-lib
.
sh: Add n
e
w
function,
test_ex
p
ect_
c
o
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
git-mer
g
e: Exit with code 2 if no strateg
y
was ab
l
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
r
e
drik Kuiv
i
nen
merge-rec
u
rsiv
e
:
R
e
plac
e
'
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-r
e
cursi
v
e: Use '~' inst
e
ad of '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
r
i
k
K
uivin
e
n
merge-recursive: Add co
p
yright not
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
dri
k
Kui
v
inen
merge-recurs
i
v
e: Indent the
o
u
t
put properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
mer
g
e-recursive: Fix support for branch n
a
mes containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k
K
ui
v
inen
m
e
rge
-
recursive
:
Fix limi
t
ed
outp
u
t of rename message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
m
e
rge-recursive:
O
n
l
y print relevant
r
ename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik K
u
i
v
inen
[PATCH] Enabl
e
a
nd fix s
u
pport
for base l
e
ss
me
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivin
e
n
[PAT
C
H] Teach git-ls-files about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivine
n
[PATCH] Teach t
h
e recursive mer
g
e
s
trategy ab
o
ut renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
e
n
[PATC
H
]
More de
s
c
rip
t
i
ve messa
g
es
for con
f
lict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
d
r
ik Kuivin
e
n
[PATCH]
recursi
v
e
-
merge: Don't pri
n
t a st
a
ck trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PATCH] Use th
e
'die' funct
i
on where it is appr
o
priate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[
P
AT
C
H] Use a t
e
mporary in
d
ex file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
AT
C
H
] Adjus
t
git-merge-re
c
ursive
.
py for
the
n
e
w tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
nen
[PAT
C
H] Do
n
't output 'Aut
o
mati
c
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
v
i
nen
[
PATCH] Be m
o
re like the 'resolve' s
t
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH]
R
ename the 'fredrik' merge
s
trategy
t
o 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[P
A
T
CH] Make the P
r
ogramErr
o
r
c
lass
p
rintable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik Kuivine
n
[PA
T
CH] Make sure we die if
w
e d
o
n
't get enou
g
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
n
en
[
PATCH] Intro
d
uc
e
a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik Kuivinen
[PA
T
CH]
E
xit with st
a
tu
s
code 2 if w
e
get
a
n exce
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redr
i
k Kuivin
e
n
[PATCH] Fix assertio
n
failure whe
n
mergi
n
g com
m
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Ma
k
e
g
i
t-app
l
y understand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree