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
Added documentation for few missing options.
2005-12-03
Fr
e
drik Kuivinen
New test case: C
r
iss-cross
m
erge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
New test
case:
m
erge with d
i
recto
r
y/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
t
est-lib
.
sh
:
Add new
function, t
e
st_
e
xpec
t
_
code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
dri
k
Kui
v
in
e
n
git-merge: Exit with c
o
de 2 if no
strategy was
a
ble
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivine
n
merg
e
-recursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivine
n
merge
-
recurs
i
ve: U
s
e '
~
' ins
t
e
ad of '_' to separ
a
te
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik
Kuivine
n
merge-re
c
ur
s
ive:
A
dd copyr
i
ght notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
merge-recu
r
sive:
I
ndent
t
he ou
t
put properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivine
n
merg
e
-
r
ecursive: Fix suppo
r
t
for branch names
containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivinen
merge
-
r
e
cursive: F
i
x limited ou
t
put
of rena
m
e m
e
ssages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
redrik Kuivinen
merge
-
recursive: O
n
ly print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
rik Kuivinen
[PATC
H
] E
n
a
bl
e
and fix support for ba
s
e less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[PATCH] Teach git-ls-files abou
t
'--'
to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
PATCH] Teach the re
c
ursive merge strate
g
y about re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Ku
i
vinen
[
PATCH]
M
ore d
e
scriptiv
e
mes
s
ages for conflict ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik Kui
v
inen
[PATCH] recursive
-
merge
:
Don't pri
n
t a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Us
e
the '
d
ie' function where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a tempora
r
y i
n
dex fi
l
e
w
hen we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuiv
i
nen
[PATCH] Adjust g
i
t-merge-recursive
.
py for the
n
ew too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
r
i
k Kuivinen
[PATCH] Don'
t
out
p
ut 'Automatic me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATC
H
] Be more like the 'res
o
l
v
e
' s
t
rategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
vinen
[PATCH] Rename the 'fred
r
ik' merge strategy to 'recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
K
uivinen
[PATCH] Make the ProgramE
r
ror
c
l
a
ss p
r
inta
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make sure we die i
f
we d
o
n't get
e
nough
a
rgumen
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH] I
n
trodu
c
e
a 'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH]
E
xit with
st
a
t
us code 2 i
f
we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH
]
Fix
a
s
sertion failure when mer
g
i
n
g common ancestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Make g
i
t-apply
u
nd
e
rst
a
nd
incomp
l
ete
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree