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
Fix git-mv for moving directories with 1 file
2005-11-20
Fredr
i
k Kuivinen
mer
g
e-recursive: Repla
c
e '
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuivinen
m
e
rge-recursive: U
s
e '~
'
instead
o
f '_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik K
u
ivinen
merge-recursi
v
e: Add
copyr
i
ght notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k K
u
iv
i
nen
m
e
rge-rec
u
rs
i
ve: Indent
the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivi
n
en
merge-
r
ecursive:
F
ix suppo
r
t for branch
n
ames containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuivi
n
en
merge-re
c
urs
i
ve
:
Fi
x
limited output of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vinen
merge
-
r
e
cursiv
e
:
Only
pri
n
t
relevant rename mes
s
ages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH
]
Enable and fix support for base l
e
ss merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
PA
T
CH] Teach git-ls-files ab
o
ut '--
'
to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Kuivi
n
en
[PATCH]
T
each the
recursive merge s
t
rategy about rename
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fred
r
ik Kuivinen
[PATCH]
M
ore descriptive m
e
ssages for
c
onflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuiv
i
nen
[PATCH
]
recursive-merge: Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik Kuivinen
[P
A
TCH] Use the 'die' fu
n
c
t
ion whe
r
e
it is approp
r
ia
t
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] U
s
e
a
tem
p
orar
y
index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kui
v
inen
[PA
T
CH] Ad
j
u
st git-m
e
r
ge-recursive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Don
'
t
output 'Automatic
m
erg
e
f
a
il
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivin
e
n
[PATCH] Be more like the 'res
o
lve' str
a
tegy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
e
drik Kuiv
i
ne
n
[PATCH]
R
ename the 'fredrik'
m
erge s
t
r
a
t
egy
t
o 'recurs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik
K
uivinen
[PATCH
]
Make the Progra
m
Error
cla
s
s printab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PATCH] Make
sure we
die if
w
e
don't get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATC
H
] Int
r
o
d
uce a '
d
i
e'
function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH]
Exit
w
it
h
statu
s
code 2 if
w
e g
e
t an exc
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivin
e
n
[
P
ATCH]
F
i
x assertion failure wh
e
n merging common ancesto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH]
Make
g
i
t-apply under
s
tand incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree