repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Properly git-bisect reset after bisecting from non-master head
2006-02-02
Fredrik Ku
i
vinen
m
e
rge-recursive: Speed up commit gr
a
p
h constru
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
me
r
ge-recursive
:
Make
use o
f
provid
e
d bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Kuivin
e
n
git-branch: Do
c
umentati
o
n fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
edrik Kuivinen
merge-recursive: Improve
t
he err
o
r message
p
rinte
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-wha
t
changed
:
Add u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivine
n
g
it-
l
og: Add
u
sage
s
tring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
e
dr
i
k K
u
ivinen
git-diff:
U
s
a
g
e s
t
ri
n
g clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
redrik Kuivinen
Usage message clean-up, t
a
ke #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
New
te
s
t ca
s
e: Cri
s
s-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
N
e
w
t
est c
a
s
e
:
me
r
ge with d
i
rectory
/
f
i
le conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivin
e
n
t
est-l
i
b
.
sh: Add
new function, tes
t
_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
Kuivinen
git-
m
erge: Exit with
c
ode 2 i
f
no strategy was
a
ble
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
mer
g
e
-r
e
cursive: Replace 'ex
c
ept
:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kui
v
inen
merge-recursive: Use
'
~
'
instea
d
of '_' to
s
eparate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
merge-recurs
i
ve: Add
c
opy
r
ight notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
mer
g
e-recursive: In
d
ent the ou
t
p
u
t properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merge-re
c
ursive
:
Fix support for bra
n
c
h names contai
n
ing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
merge-recu
r
s
i
ve: Fix limited o
u
tput of re
n
ame mess
a
ges
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kuivine
n
merge
-
re
c
u
r
sive: Only print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
ivinen
[PATCH] E
n
able and
f
ix support
for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Kuivinen
[PATCH] Teach git
-
l
s-files abou
t
'--' to denot
e
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[PATCH] Teac
h
the
r
ecursive m
e
rge strat
e
g
y
ab
o
ut renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[PATCH]
M
o
re
descriptive m
e
ssages
for c
o
nflic
t
cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[P
A
TCH]
r
ecursive-merge: Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
iv
i
nen
[PATCH] Use the
'
di
e
' function wh
e
re it
i
s
appropr
i
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH] Use a temporary ind
e
x f
i
le
w
hen we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Ku
i
vinen
[PA
T
CH
]
Adjust
g
it-merge-recursive
.
py for the ne
w
t
ool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
uivinen
[PATC
H
] Do
n
't outpu
t
'Automatic
m
e
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATC
H
] Be more lik
e
the
'
re
s
ol
v
e' str
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[
PAT
C
H] Rename the 'fredrik' me
r
ge strategy
to 'recur
s
ive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[P
A
TCH] M
a
ke the ProgramError clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[PAT
C
H] Make sure we die if we don't ge
t
eno
u
gh argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivin
e
n
[PATCH] Introduc
e
a 'die'
f
unction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PA
T
CH
]
E
xit with
statu
s
code 2 if we g
e
t an ex
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH
]
Fix as
s
ertion failure when merging common
a
n
cestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
K
uivi
n
e
n
[PATCH] Make g
i
t-apply
unders
t
a
nd
in
c
omplet
e
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree