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
Documentation: fix missing links to git(7)
2005-12-03
F
redrik Kuivinen
N
ew test
c
ase: Cr
i
ss-cross
m
erge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivin
e
n
New
test cas
e
: merg
e
with
dir
e
ctory/fi
l
e conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
test-lib
.
sh: Add new
function, test_e
x
p
ect
_
code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k
Kuivinen
git-merge: Exit with code
2
i
f
n
o str
a
t
egy
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fre
d
rik Kuivi
n
en
m
e
r
g
e
-
recur
s
ive:
R
e
p
l
ace 'e
x
cept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik
Kuivinen
merge-recursive:
U
se
'
~' instead
o
f
'
_
' to separat
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-r
e
cursi
v
e:
Add c
o
p
y
right n
o
tice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik
Kuivinen
merge-recur
s
ive: Indent the output proper
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
merge-re
c
ursive: Fix supp
o
rt for branch names containi
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merg
e
-recursive:
F
ix limited o
u
tput of r
e
name messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivinen
merge-recu
r
sive: Only print
r
e
l
e
vant rename message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredri
k
Kuivi
n
en
[
PATC
H
] Enabl
e
and fix
suppor
t
f
or base less
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach git-ls-files about '
-
-' to denote en
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach the recur
s
ive merg
e
strat
e
g
y
a
b
ou
t
rena
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
vine
n
[PATCH] More
d
escriptive
message
s
f
o
r con
f
lict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
ri
k
Kuivinen
[PATCH] re
c
u
rsi
v
e-merg
e
:
D
o
n
't print
a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik K
u
ivi
n
en
[PATCH] Use the
'd
i
e' functio
n
where it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
inen
[PATCH] Use
a
temporary in
d
ex f
i
le whe
n
we merge th
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
r
ik Kuivi
n
en
[PATC
H
]
Adjust git-m
e
r
g
e-recu
r
sive
.
py for
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PAT
C
H
] Don't output
'Automatic m
e
rge
failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivin
e
n
[PATC
H
] Be more lik
e
the '
r
esolv
e
'
strat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH] Rename the 'fredrik' merge strategy
t
o
'
recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[P
A
TCH] Make the Pr
o
g
r
a
m
E
r
ro
r
class pr
i
n
t
able
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[
PATCH] Make sure we
d
ie if
w
e
d
o
n't get enough argu
m
ents
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vinen
[
P
A
T
C
H] Intro
d
uce a
'
d
ie' f
u
n
ction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
r
i
k Kuivinen
[
P
ATC
H
] Exi
t
w
i
th statu
s
code 2
i
f
w
e get an
e
x
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
K
uivine
n
[PAT
C
H] Fi
x
assertion fail
u
re when mergin
g
common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
inen
[PAT
C
H] Make
g
i
t-
a
ppl
y
under
s
t
and inc
o
mpl
e
te li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree