repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
More useful/hinting error messages in git-checkout
2006-02-14
Fredrik
Kuivinen
s/SHELL/SHELL_PATH/ in
Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
e
drik
K
uivin
e
n
merge-recursive: Speed up commit graph co
n
struction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivine
n
merge-
r
e
c
u
rsive: Ma
k
e
us
e
of provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kui
v
in
e
n
gi
t
-branch: Do
c
u
menta
t
ion fix
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
d
rik Kuivin
e
n
merge-r
e
cursi
v
e: Improve the error message print
e
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Kuivinen
git-whatc
h
an
g
ed: Ad
d
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivinen
gi
t
-log: Add
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
redrik
Kuivinen
git-diff: Usage string
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredr
i
k Kuiv
i
n
e
n
U
s
age message cl
e
an-up,
t
ake #2
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
New test case:
C
riss
-
cross
m
erge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
ri
k
K
uivin
e
n
New test case
:
merg
e
with
direct
o
ry/file
c
onflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
te
s
t-lib
.
sh:
Add n
e
w
f
unction, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
edrik Kuivinen
gi
t
-m
e
r
g
e
: Exit wit
h
c
ode 2 if no
strategy
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
d
rik Ku
i
vinen
m
e
rge-recursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kuivinen
m
e
rge-rec
u
rs
i
ve: Use '~' in
s
tead of '_' to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
u
ivinen
merge-recursive: A
d
d copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
me
r
ge-recursive: I
n
den
t
the output properl
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik Kuivinen
merge-recursive: Fix
s
upport f
o
r bra
n
ch
names
c
ontaining
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
merge-recursive: F
i
x
l
imi
t
ed output of rename mes
s
ages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik Kuivine
n
merge-rec
u
rsi
v
e: Only print
r
e
levant rename messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fre
d
rik Kuivinen
[PATCH] En
a
ble and fix support f
o
r
base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH
]
Te
a
c
h
g
it-ls-fi
l
es
about '-
-
' to
d
enote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivine
n
[
P
ATCH] Teach t
h
e
r
ecursive m
e
r
g
e
strategy
a
bout renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivine
n
[PATCH] M
o
re
d
e
scriptiv
e
messages for
con
f
lict c
a
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH]
r
ecur
s
ive-merge: Don't pr
i
nt
a
stac
k
trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kui
v
inen
[PATCH] U
s
e the 'die' functio
n
whe
r
e it is
a
p
propriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PAT
C
H] Use a tempor
a
r
y i
n
dex file when
w
e me
r
g
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] A
d
just gi
t
-merge-recursive
.
py for
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
u
i
vinen
[PATCH]
D
o
n't ou
t
put '
A
utom
a
tic m
e
rge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be more li
k
e
t
he
'
resolve' st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik
K
uivin
e
n
[PATCH
]
Rename the 'fredrik' merge strategy to 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
Make the
Prog
r
amEr
r
o
r
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[PATCH] Make
s
ure we die if
w
e do
n
't
g
et enough
a
r
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivine
n
[PATC
H
] Introdu
c
e a 'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
e
d
rik Kuivinen
[P
A
TCH
]
Exit with
s
ta
t
u
s
code 2 if we get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
P
ATCH] F
i
x assertion fa
i
l
ure when merging
c
o
mmo
n
ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik K
u
i
vinen
[PATCH] Make
g
it-apply understan
d
incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree