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
GIT 0.99.9j aka 1.0rc3
2005-11-12
Fred
r
ik
K
u
i
vinen
m
e
rge-recursive: Use '~' instead of '_' to
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Ku
i
vi
n
en
merge-re
c
ursive: Ad
d
copyri
g
ht
notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
m
erge
-
recursive: Inden
t
the outpu
t
pro
p
erly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Kuivinen
me
r
g
e-recursiv
e
: Fix support for bran
c
h
n
ames containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kui
v
inen
merge-recursive:
F
ix
l
i
mited ou
t
put of r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredri
k
Kuivinen
merge-recursive
:
Only prin
t
rele
v
ant re
n
am
e
messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik Kuivi
n
en
[
P
ATCH] Enable and
f
i
x
support for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivinen
[P
A
TCH] Teach gi
t
-ls-
f
iles
a
bout '--' to denote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[PATC
H
] Teach the rec
u
rsiv
e
mer
g
e strategy about
renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kui
v
in
e
n
[PATCH]
More descriptive messages fo
r
conf
l
ict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivinen
[PATCH] recur
s
ive
-
m
e
rge: D
o
n't print a
s
tack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
dri
k
Kuivinen
[PATCH] U
s
e t
h
e
'
die' function where it is a
p
propr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivin
e
n
[P
A
T
C
H] Use a temporary
i
nd
e
x file when we
m
erge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
ri
k
Kuivinen
[PATCH] Ad
j
u
st g
i
t-merg
e
-r
e
cur
s
ive
.
py for the ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Don
'
t out
p
ut
'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edr
i
k Kuivinen
[PATCH] Be more like
t
he
'
resolve' str
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
K
u
i
vinen
[P
A
TCH] Rename the 'fredrik' m
e
rge str
a
t
e
g
y to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[
P
ATCH] Ma
k
e the P
r
ogramError
clas
s
printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
ed
r
ik Kuivinen
[PATCH] Make sure w
e
di
e
if
w
e don'
t
get
e
nough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Introduce
a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Ku
i
vinen
[PATCH] Exit with statu
s
code 2
if we get an ex
c
epti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redr
i
k
K
uivinen
[
PATCH] Fix
assertion
failure when
m
e
r
ging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredr
i
k Kui
v
in
e
n
[PATCH] Make git-apply un
d
erstand incomplete li
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree