repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update howto using-topic-branches
2005-11-08
Fredr
i
k Kuiv
i
n
e
n
m
er
g
e-recur
s
ive: Only pr
i
nt rele
v
ant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
ivinen
[PATCH]
E
n
a
b
le and fix
s
u
pport for base
l
ess merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik
Kuivine
n
[PATCH] Teach
gi
t
-ls-files about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[PATCH] Teach the
recursive m
e
rge
strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
A
TCH] Mor
e
d
escriptive messages for conflict ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
i
vinen
[
PATCH] recu
r
siv
e
-me
r
g
e: Don't
p
rint a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
r
i
k
K
uivinen
[
PATCH] Use the 'di
e
' functio
n
wh
e
re it is appropr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[
PATCH] Use a
t
empora
r
y index file wh
e
n
we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivine
n
[PATCH
]
Ad
j
ust git-merge-recu
r
sive
.
py fo
r
t
h
e
new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H
] Do
n
't out
p
ut
'Automatic m
e
rge fail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be more
like the 'resolv
e
' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PAT
C
H
]
Rename
the 'fredr
i
k' me
r
g
e
strategy to 'recu
r
siv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
re
d
rik Kuivinen
[PAT
C
H] Make the ProgramErr
o
r class printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivine
n
[PATC
H
] Make sure w
e
d
i
e if we don't get eno
u
gh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivine
n
[
P
ATCH]
I
ntr
o
duce a 'die
'
funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuiv
i
nen
[PATCH] Exit w
i
th stat
u
s code 2 if we ge
t
an
e
x
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivin
e
n
[PATC
H
] Fix a
s
sertion failure when mergi
n
g com
m
o
n
ances
t
o
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivin
e
n
[PATCH] Make git-apply under
s
tand
inc
o
mplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree