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
git-revert: Usage string clean-up
2005-12-14
f
reku
0
45@student
.
.
.
g
i
t-r
e
vert:
U
sage string
c
lean-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku045@student
.
.
.
git-
v
erify-tag: Usage string cl
e
an-up, e
m
it
u
s
ag
e
stri
n
g
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
freku045@stud
e
n
t
.
.
.
Tr
i
vial
u
sage stri
n
g c
l
ean-up
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-14
F
r
e
drik Kui
v
inen
Usag
e
message cle
a
n-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
New test case: C
r
iss-cross merge
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
New test
c
ase: merge
w
ith di
r
e
ctory
/
file conflicts
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik
K
ui
v
in
e
n
te
s
t
-
l
i
b
.
sh: Add new function
,
t
est_ex
p
ec
t
_code
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
g
i
t
-
merge: Exit with code 2 if no strategy w
a
s able
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
Ku
i
vinen
m
e
r
g
e-re
c
u
rsiv
e
: Replace 'except:'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
iv
i
n
e
n
merge-r
e
cursive: Use
'
~' instead of '_' t
o
separat
e
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
drik Kuivinen
merge-
r
ecursive: Ad
d
copyright not
i
ce
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive:
Indent the
o
utput properly
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
m
e
rge
-
recursiv
e
: F
i
x
support for branch name
s
contain
i
ng
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
mer
g
e-
r
ecursive: Fix limited
o
u
tput of rena
m
e m
e
s
s
ages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
merge-
r
e
cursive: Only print
relevant rename me
s
sages
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uiv
i
nen
[PATCH] Enab
l
e and fix
support for base
less merges
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
iv
i
nen
[PATCH] Teach git-ls
-
files abo
u
t
'
--'
t
o
de
n
ote end
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
rik Ku
i
vinen
[P
A
TCH] Teach the recu
r
sive merge st
r
ate
g
y a
b
ou
t
rename
s
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] More de
s
cripti
v
e messages
for confl
i
ct cases
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] recu
r
sive-mer
g
e: Don't print a stack trace
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k K
u
ivinen
[
P
A
T
C
H
]
U
se the 'die' func
t
ion
w
here it is appropriate
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a te
m
porary index f
i
l
e when
we merg
e
the
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
vinen
[
P
ATCH] Adjus
t
git-me
r
ge
-
r
ecur
s
ive
.
py for t
h
e 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
e
rge fa
i
le
d
,
.
.
.
'
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
PATCH]
Be m
o
re
l
ike the 'reso
l
ve' strategy
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[PAT
C
H] R
e
name t
h
e 'fred
r
ik' merge s
t
rategy
t
o
'recursive'
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
i
k
Kuivi
n
en
[PAT
C
H] Make
t
he Progra
m
Err
o
r
cl
a
ss pri
n
table
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivin
e
n
[
PAT
C
H] Ma
k
e
sure we d
i
e i
f
we don't get enough arguments
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] In
t
rodu
c
e a 'die'
f
unction
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
rik Kuivinen
[PATCH] Exit with
s
tatus code 2 if we get an
exc
e
pt
i
on
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH] Fix asse
r
tio
n
failure when merg
i
ng co
m
m
o
n an
c
est
o
rs
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
Kui
v
inen
[PATCH] Make gi
t
-
apply und
e
rstand incomplete lin
e
s
.
.
.
Signed-off-by: Fredrik Kuivinen <
freku045@student.liu.se
>
commit
|
commitdiff
|
tree