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
Docs: move git url and remotes text to separate sections
2006-02-02
Fredrik Kuivinen
m
e
rge
-
recursiv
e
:
S
peed up c
o
mmit graph const
r
uc
t
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik K
u
ivinen
merge-re
c
ursiv
e
: Make use of provided b
a
ses
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivin
e
n
git-branch: Doc
u
mentati
o
n fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
m
e
rge-recurs
i
v
e:
Imp
r
ove th
e
error message print
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik
K
u
i
vinen
git-what
c
hanged: Add u
s
age strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivi
n
en
git-log:
A
dd
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik K
u
ivinen
gi
t
-di
f
f: Usage st
r
ing clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage mes
s
age c
l
ean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
r
ed
r
ik Kuivinen
New
test case
:
Criss-cross
m
e
rge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik
K
uivinen
N
e
w test case:
merge
w
i
th
director
y
/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivi
n
en
test-li
b
.
sh: A
d
d new f
u
nction, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
drik Kuivinen
git-merge
:
Exit w
i
th code 2
i
f
no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredri
k
Kuiv
i
n
e
n
merge-recu
r
sive:
Re
p
lace
'
except:
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merg
e
-recursiv
e
: Use
'
~' instead of '_' t
o
se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vinen
m
erge
-
recursive: Ad
d
copyrig
h
t notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Kui
v
i
n
en
merge-
r
ecursive: I
n
dent the output
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivinen
m
er
g
e-recursive: Fi
x
s
upport for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edr
i
k Kuivin
e
n
merge-recursive: F
i
x limited ou
t
put of rename messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik Kuivinen
merge-recursive: O
n
ly print releva
n
t rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
r
ik Kuivinen
[
P
A
T
CH] En
a
ble and f
i
x suppo
r
t
for base l
e
ss m
e
rges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[PATCH] Te
a
ch git-ls-files about '-
-
' to denote
end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
P
ATCH]
T
each the rec
u
rs
i
ve merge
s
trategy about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivine
n
[PATCH] Mor
e
descrip
t
ive messag
e
s for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivi
n
en
[
P
ATCH] recursive-merge: Don
'
t
print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redr
i
k Kuivinen
[PATCH] Use the
'die'
func
t
i
on where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH] Use a temporary index file wh
e
n w
e
merg
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Ku
i
vinen
[
PATCH]
A
djust git-
m
erg
e
-rec
u
rsive
.
py for the new too
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH]
D
on'
t
out
p
u
t
'Automatic merge
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik
Ku
i
vinen
[PATCH
]
Be more like the '
r
eso
l
ve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PAT
C
H
] Rename
t
he 'fredr
i
k' merge
s
trategy
t
o 'r
e
cu
r
si
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
ake
t
h
e ProgramError clas
s
printab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
u
i
vinen
[PA
T
C
H] Make sure we die if we
d
on't get enough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik
K
uivin
e
n
[PATCH] Int
r
o
duc
e
a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivin
e
n
[
P
ATCH
]
Exit
wi
t
h sta
t
u
s
code 2
if
we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
inen
[PATCH] Fix
a
ssert
i
o
n failure
w
hen m
e
rging common ancestor
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kuivinen
[PATCH] Make
g
it-apply under
s
tand inc
o
m
plete line
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree