repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge fixes up to 1.2.1
2006-02-14
Fr
e
drik
K
uivine
n
s/SHELL/SHELL_PA
T
H/
i
n Ma
k
efile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fr
e
drik K
u
iv
i
nen
merg
e
-r
e
cur
s
ive: Speed up com
m
it
graph
construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge
-
recursive: Mak
e
use of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
K
uivinen
git-branch: Doc
u
mentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fre
d
rik K
u
ivi
n
en
merge-re
c
u
r
si
v
e: Improv
e
the error me
s
sage pr
i
nted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-wha
t
ch
a
n
g
e
d
: A
d
d us
a
ge string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Ku
i
vinen
git-log: Add usage str
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
g
it-diff: Usage string cle
a
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Us
a
g
e
me
s
s
a
g
e clean-up, take
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivinen
New test
c
ase: Criss-cross
m
er
g
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
New test case: m
e
rge wi
t
h
d
irector
y
/file
c
onflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik K
u
iv
i
nen
test
-
li
b
.
s
h: A
d
d n
e
w function, test_ex
p
ect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
r
ik
K
ui
v
inen
git-mer
g
e: Exit wit
h
code 2 if no strategy w
a
s able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Ku
i
vinen
merge-r
e
cursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik
K
u
i
v
i
n
e
n
merge-recursive: U
s
e '~' instead of '_' to s
e
parate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik
K
uivinen
merge-recursive: Add
copyright
n
o
tice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k
K
uivi
n
en
merge
-
r
e
curs
i
ve: Inde
n
t
the
o
utpu
t
p
r
operly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
u
i
vinen
me
r
ge-rec
u
r
sive: Fix supp
o
rt for branch na
m
es conta
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivine
n
mer
g
e
-
recursive: Fix limited output of rename
m
es
s
a
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik
K
uivinen
merge-recur
s
ive: Only print relevant r
e
nam
e
messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[
PATCH] Enable
and f
i
x
sup
p
ort for bas
e
less m
e
r
ge
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teac
h
git-ls-files abou
t
'-
-
' to denote
e
nd
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PAT
C
H
] Teach the recursive merge st
r
ategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
PATCH]
M
ore descr
i
p
tive
m
ess
a
ges for con
f
lict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik K
u
ivinen
[PATCH] recursive-merge: Don't print a st
a
c
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
u
i
vinen
[
P
ATCH]
U
se
t
h
e
'die
'
function where it is appropr
i
at
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
d
r
ik Kuivinen
[PATCH] Use a t
e
mporary i
n
dex fil
e
when we merg
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
re
d
rik Kui
v
inen
[PATCH
]
A
djust git
-
merge-recur
s
ive
.
py for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
Kuivin
e
n
[PATCH] Don'
t
o
u
t
put 'Automa
t
i
c merg
e
f
aile
d
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik Kuivinen
[PATCH] Be more like the 'res
o
lve
'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
K
u
ivinen
[PATCH] Rename the 'f
r
edrik' merge
st
r
ategy t
o
'
r
ecursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make the Progra
m
Error
c
lass printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik
Kuivin
e
n
[
P
ATCH]
M
ake sure we die if we don't get enough a
r
guments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
r
i
k Kuivinen
[
P
ATCH] I
n
tr
o
duce a 'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[PATCH] Exit w
i
th s
t
atu
s
code 2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
F
ix
assertion fail
u
r
e
whe
n
merging co
m
mon
ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
redrik
Kuivinen
[PATCH] Make git-apply understand incomplete l
i
n
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree