repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff --abbrev: document --abbrev=<n> form.
2005-12-16
Fredrik Kuiv
i
nen
git-w
h
atchanged: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
dri
k
Kuivi
n
e
n
git-log: A
d
d usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-diff:
U
sag
e
s
tring clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fr
e
dr
i
k K
u
ivi
n
e
n
Usage message clean-up, take #
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
in
e
n
New test case: Cris
s
-
cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
drik Kuivin
e
n
New test case: merge with directory/
f
ile conflic
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivin
e
n
t
e
s
t
-lib
.
s
h
:
A
dd new function, test_expe
c
t
_
co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
drik Kuivinen
g
it-merge:
Exi
t
with code 2
if
n
o st
r
ategy
was
able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fr
e
drik Kuivinen
merge-recursive: Repla
c
e
'
ex
c
e
p
t:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
me
r
ge-r
e
c
ursiv
e
:
Use '~' i
n
stead of
'
_' to
s
eparat
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik
Kuivinen
mer
g
e
-
r
ecursive
:
Add
cop
y
rig
h
t notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuivinen
merg
e
-recursive: Indent the output pr
o
per
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
d
r
i
k
K
uivinen
m
e
rge-
r
ecursiv
e
: Fix support for branch n
a
me
s
containin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
ik Kuivinen
merge-recursive: Fi
x
limited output
of
r
ename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edri
k
Kuivi
n
en
merg
e
-recursive:
O
nly
print relevant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
ivinen
[PAT
C
H
] Enable and f
i
x supp
o
r
t f
o
r ba
s
e
l
e
s
s m
e
r
ges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH]
T
each git
-
ls
-
f
iles about '-
-
' to
d
en
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
ivinen
[PATCH] Te
a
ch the recursive m
e
rge strategy about r
e
names
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
red
r
ik Kuivinen
[PATC
H
]
More
descriptive messages for
conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fre
d
rik Kuivine
n
[PA
T
CH
]
recursive-merge:
D
on't print
a s
t
ack trac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik Kuivinen
[
P
ATCH]
U
s
e t
h
e '
d
ie'
f
un
c
tion where it is app
r
o
priat
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Ku
i
vinen
[PATC
H
] Use a temporar
y
index f
i
le when
w
e merge t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATC
H
]
A
d
just git-merge-recursive
.
py fo
r
the
ne
w
tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Don't output
'Automatic merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[
P
ATCH]
B
e m
o
re li
k
e the 'resolve'
st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuiv
i
ne
n
[PATCH]
R
ena
m
e the 'fredrik' merge strategy
t
o
're
c
ursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivi
n
en
[PATCH] Make the Program
E
rr
o
r c
l
a
s
s
p
ri
n
tab
l
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
Kuivinen
[PATCH
]
M
a
k
e sure we die if we don't g
e
t enough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik
Kuivinen
[PA
T
C
H] In
t
rodu
c
e a 'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k Kuivinen
[P
A
TCH]
Exit
with status
c
ode 2 i
f
we get an
e
xception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Fix assertion failure when
merg
i
n
g
c
ommon ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuiv
i
nen
[PAT
C
H] Make git-appl
y
unders
t
and incompl
e
t
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree