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
Rename git-config-set to git-repo-config
2005-11-20
Fredri
k
Kuivinen
me
r
ge-recur
s
ive: Re
p
lace '
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
r
ik
Kuivinen
merge-r
e
cursive
:
Use '~' i
n
ste
a
d of '_'
to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
K
uivinen
merge-rec
u
rsiv
e
:
Add co
p
yright
n
otice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
m
e
rge-recu
r
sive: I
n
dent
the output pro
p
erly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivin
e
n
merg
e
-rec
u
r
s
i
v
e: Fix support for branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fre
d
rik Kuivinen
merge-
r
ecursive: Fix limited
o
ut
p
ut
o
f rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fr
e
drik Kuivinen
merge-recursive: Only pr
i
nt relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivi
n
en
[PATCH] Enable and f
i
x support for base
less m
e
rges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
PATCH]
T
each
gi
t
-
l
s-f
i
les abo
u
t '--' to
d
e
note end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PA
T
CH] Teach th
e
recursi
v
e merge
stra
t
egy
a
bout r
e
nam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kuivinen
[P
A
TCH]
Mo
r
e descriptive messages for conflic
t
case
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
redrik
K
ui
v
inen
[PATCH] rec
u
rsiv
e
-mer
g
e: Don't p
r
int a stack
t
r
a
ce
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
Kuivine
n
[PATCH] Use the 'die
'
function where it
i
s ap
p
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATCH
]
Us
e
a tempor
a
ry index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
en
[PATCH] Adjust git-m
e
rge-recursive
.
py for the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edri
k
Ku
i
vinen
[PATCH] Don't
output 'A
u
tomatic merg
e
fa
i
led,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PATCH] Be more l
i
ke the 'resolve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATC
H
]
R
e
name the 'fr
e
drik' merge strate
g
y
to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH
]
Make the P
r
ogr
a
mError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[PATCH]
Make sure we d
i
e if we don't get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuiv
i
nen
[PATCH] In
t
r
o
d
u
ce a 'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
red
r
ik Kui
v
inen
[PATCH] Ex
i
t with sta
t
us co
d
e
2 if we get an
exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PAT
C
H] Fix assertion failur
e
wh
e
n merging com
m
on ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
r
edrik Kuivi
n
en
[PATCH]
Make
g
it-
a
pply
understan
d
i
n
co
m
plet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree