repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Basic documentation for git-show
2006-02-02
F
r
edrik Kuivinen
merge-recursi
v
e
:
Spe
e
d
u
p co
m
mit g
r
aph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redri
k
Kui
v
inen
m
e
rge-recursive: Make use of provid
e
d bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
K
uivin
e
n
git
-
branc
h
: Do
c
umentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
m
er
g
e-recursive: Improve
the error
mess
a
ge printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik
Kuiv
i
nen
git-whatchang
e
d: Add usag
e
stri
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik K
u
ivinen
git-
l
o
g
: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
n
en
git-diff: Usage string
c
lean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
drik
K
uiv
i
nen
U
s
age mess
a
ge cl
e
an-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New
test case: Cri
s
s-cross m
e
r
ge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
r
i
k
K
uiv
i
nen
New
t
e
s
t case:
m
erge
w
i
t
h
dire
c
t
ory/file
conflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kui
v
i
n
en
test-lib
.
sh:
A
dd new function
,
test_expect_
c
ode
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuiv
i
nen
git-merg
e
: Exit wi
t
h
c
ode 2 if no
st
r
ategy was
abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
K
uivinen
merge-recursive: Rep
l
ace
'
except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
redr
i
k Kuiv
i
nen
merge-re
c
u
rsive: Use '~' i
n
stead
of '_' to
sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik K
u
ivinen
m
e
rge-recu
r
sive: Add co
p
y
r
ight notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-r
e
c
ursive: Indent the
output
pr
o
perly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivi
n
en
mer
g
e-
r
ec
u
r
s
ive: Fix su
p
por
t
for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivi
n
en
merge-r
e
cursiv
e
: Fix
l
imited o
u
tput of r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge
-
recur
s
ive: Only print relevan
t
rename me
s
s
ag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[
P
ATCH] Enable and fix
suppor
t
for
bas
e
l
ess merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuiv
i
nen
[PATCH] Teach git
-
ls-files about '-
-
' to
denot
e
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik
Ku
i
v
i
n
en
[PATC
H
] Teach the re
c
ursive merge strate
g
y
a
bout renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
ivinen
[
PAT
C
H
]
Mor
e
d
escriptive messages for confl
i
ct
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
K
u
i
vi
n
en
[PATCH
]
recurs
i
ve-mer
g
e: Don't prin
t
a stack tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Ku
i
v
i
nen
[
P
ATCH] Use the
'di
e
' fun
c
tion where it is
a
ppropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PAT
C
H] Use
a temporary ind
e
x file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] A
d
just git
-
me
r
g
e
-recursive
.
py for t
h
e new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuiv
i
nen
[PA
T
CH] Don'
t
o
utput 'Automati
c
merge
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
Kuivinen
[P
A
TCH
]
Be more l
i
ke th
e
're
s
o
lve
'
s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kui
v
i
n
e
n
[
P
A
TCH] Rena
m
e the 'fredrik' merge str
a
t
egy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH] Make the
P
r
ogramError clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Mak
e
s
ure we d
i
e if we don't get enough
arg
u
ments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PA
T
CH
]
Introduce a
'd
i
e
'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PAT
C
H] Exit with status code 2 if we
get an e
x
ce
p
tio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivi
n
e
n
[PATCH] Fix
assertion failure wh
e
n mer
g
ing commo
n
a
n
c
e
st
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik
Kuivi
n
e
n
[PAT
C
H] Make
git-appl
y
under
s
tand i
n
compl
e
te lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree