repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Indent the output properly
2005-11-12
Fredrik Kuiv
i
nen
merge-re
c
ur
s
ive:
Inde
n
t the outpu
t
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
merge-recursiv
e
: Fix supp
o
rt fo
r
b
ranch name
s
containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
redrik Kuivinen
merge
-
r
ec
u
rsive: Fix
l
imited output of ren
a
me messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredri
k
Kuivinen
merge-recursive: Only print relevant rename
m
e
s
sa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fred
r
ik Kuivinen
[PATCH] E
n
a
ble and fix
support for base le
s
s merge
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivinen
[
PAT
C
H
] Te
a
ch git-ls
-
f
iles
about
'
--
'
to
denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
redrik Kuivinen
[
P
ATC
H
] Te
a
c
h the re
c
ursive merge
s
t
r
ate
g
y about rena
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] M
o
re descriptive
m
essages
f
or confl
i
ct cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PAT
C
H] re
c
u
rsive
-
merge: Don't
print a stac
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Use th
e
'd
i
e
' function where
it i
s
appropri
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
dri
k
Kuivi
n
e
n
[PATCH] Use a tem
p
o
r
ar
y
i
n
dex file when we
merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Kuivin
e
n
[PA
T
CH] Adjust git-merg
e
-recursive
.
py for the new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivin
e
n
[PATCH] Don't output 'Automa
t
ic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
red
r
ik Kuivinen
[PATCH]
B
e more like the 'resolve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivinen
[PATCH] Rename
the '
f
redri
k
'
merge stra
t
egy to 'rec
u
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
a
ke
the ProgramError class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PATCH
]
Make sure we die if we don
'
t get
e
nough
a
r
guments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edri
k
Kuivinen
[PAT
C
H] Introduce a
'die'
f
uncti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kui
v
i
n
en
[P
A
TCH] Exit with
s
tatu
s
cod
e
2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Ku
i
vin
e
n
[PATC
H
] Fix assertion failure when m
e
rging common ancesto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[
P
ATCH] Make git-appl
y
under
s
tand inco
m
plete
l
ines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree