repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
arguments cleanup and some formatting
2005-11-20
Fredrik Kuivinen
merge-
r
ecursi
v
e: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik
Kuivi
n
en
merge-rec
u
r
s
ive:
Use '
~
' instea
d
of
'_' to sepa
r
ate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fred
r
ik Kuivinen
merge
-
r
e
cursive:
Add
co
p
yrigh
t
n
o
t
ice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivin
e
n
merge-rec
u
rsive: Indent the ou
t
pu
t
prope
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
d
rik Kuivinen
merge-recurs
i
ve: Fix sup
p
ort f
o
r branch names
c
on
t
aining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivinen
merge-recursive: Fix li
m
it
e
d output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivi
n
en
mer
g
e-recur
s
i
v
e
: Only
print relevant rename messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PAT
C
H
]
Enable
a
nd
f
ix
support fo
r
base less
m
e
rges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PATCH] Teach git-ls-file
s
about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PAT
C
H] Teach the recursive
m
e
r
ge strategy about r
e
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuivinen
[PATCH] M
o
re
descriptive
messages for conflict
cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivin
e
n
[
P
ATCH] recursive
-
mer
g
e: Don't print a stack tra
c
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[PATCH]
U
se the 'die' function wh
e
re it i
s
appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PATCH] Us
e
a t
e
mporary index
file when w
e
m
e
rge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Ku
i
vinen
[PATCH] Adjust git
-
m
e
r
ge-
r
e
c
ursive
.
py f
o
r the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH
]
Don't o
u
tp
u
t '
A
ut
o
mati
c
merge
f
ai
l
e
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
ik Kuivinen
[PATCH] Be more like the 'r
e
solve' st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
d
rik Kuivin
e
n
[PATCH] Rename the 'fre
d
rik' merg
e
strategy to 'rec
u
rsive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
M
a
k
e
the Progr
a
mError class pr
i
ntabl
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PA
T
CH] Make su
r
e we
die if
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
[PAT
C
H
]
Intro
d
uce a 'die' funct
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik
Kuivinen
[
P
ATCH] Exit with status code
2
i
f we ge
t
an excep
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Fi
x
assertion
f
ailure when
merging
common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kui
v
in
e
n
[PATCH] Make git-apply under
s
tand
i
ncomp
l
et
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree