repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rev-lib: Make it easy to do rename tracking (take 2)
2006-03-11
Fredrik Ku
i
v
i
nen
r
e
v-lib:
M
ak
e
it ea
s
y to do rename tr
a
cking (take
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivi
n
en
Make it po
s
sible to
not clob
b
e
r
object
.
util in sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Ku
i
vinen
N
i
cer output f
r
om 'gi
t
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
ed
r
ik Kuivinen
Remove trailing dot aft
e
r s
h
ort descript
i
o
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik
Kuiv
i
nen
Fix s
o
me inconsistencies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredr
i
k Kuivinen
gi
t
-bl
a
me: Use the same
tests for
g
i
t-b
l
a
me as
f
or
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
redrik Kuivinen
git-bl
a
me: Mak
e
the
o
utput
h
um
a
n readabl
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
redrik Kuivinen
gi
t
-
b
l
ame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik
K
uivinen
Add git-b
l
a
m
e, a tool for ass
i
gning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredri
k
Kuivinen
s/SHELL/SHELL_PATH/ i
n
Makef
i
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-recursiv
e
: S
p
eed up c
o
mmit grap
h
c
ons
t
ruc
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik Kuivin
e
n
merge-recu
r
si
v
e: Make use of provided b
a
ses
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redr
i
k
Kui
v
inen
git-branch: Documenta
t
ion fix
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
redrik Kuivin
e
n
merg
e
-recursive:
Im
p
r
ove the e
r
ror message p
r
inted
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kui
v
inen
git-wha
t
cha
n
ged:
A
dd u
s
a
g
e strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
g
it-log: Add usag
e
string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivinen
g
it-diff: Usa
g
e st
r
i
n
g
clea
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredri
k
Kuivinen
Usag
e
message cle
a
n-u
p
,
t
a
k
e
#2
commit
|
commitdiff
|
tree
2005-12-03
F
r
edr
i
k Ku
i
v
inen
New test case
:
Criss-cross me
r
ge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik
K
uivinen
New test case
:
merge
w
ith d
i
rector
y
/file
c
o
nflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
t
e
st-lib
.
sh: Add new
f
unction, test_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
F
r
e
d
r
ik Kuivinen
git-
m
erge
:
Exit with code
2
if no s
t
rategy was abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
m
er
g
e-r
e
cursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge
-
recursive: U
s
e '~' instead of
'
_' to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuiv
i
nen
merge-recurs
i
ve
:
Add copyright
n
o
t
i
ce
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivi
n
en
merge-r
e
c
u
rsive: Indent the
o
ut
p
ut properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fred
r
i
k
Kui
v
inen
merge-rec
u
r
sive: Fix sup
p
or
t
f
o
r
branch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
mer
g
e-re
c
u
rsive:
F
i
x limited o
u
tput
o
f rename messa
g
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik
Kuivinen
me
r
g
e-recu
r
sive: Only print r
e
l
e
vant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uivinen
[PATCH] Enable an
d
fix s
u
pport for base less mer
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivin
e
n
[PATCH]
Teach git-
l
s-fil
e
s a
b
out '--'
t
o denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k
K
uiv
i
nen
[
PATCH] Teach
t
he recursive merge strat
e
gy about r
e
names
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
u
ivinen
[
P
AT
C
H] More des
c
riptive
messages
for conf
l
ict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
drik Kuivi
n
en
[PATCH]
recursive-merge:
D
on't prin
t
a sta
c
k trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
i
v
inen
[PAT
C
H] Use the 'die' function
w
h
e
re
i
t is appropr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Use a temporary ind
e
x file wh
e
n we m
e
rge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuiv
i
n
e
n
[PATC
H
] A
d
just git-merg
e
-
r
ecursive
.
py for the
n
ew tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Ku
i
vinen
[
PATCH] Don't out
p
ut '
A
utom
a
ti
c
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[
PATCH] Be
more
l
i
ke th
e
'resolve' strateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik
K
u
i
vinen
[PATCH]
R
ename the 'fre
d
rik' merge strategy
t
o 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH]
M
ake the Progr
a
mError c
l
ass printa
b
le
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik K
u
ivin
e
n
[
P
ATCH]
Make sur
e
we
die if w
e
don't
get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kui
v
ine
n
[PA
T
CH] Introduce a '
d
ie'
f
u
n
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PA
T
CH]
E
xit
w
ith status code 2 if w
e
get an
exce
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
u
ivinen
[
P
A
TCH
]
Fix as
s
ertion fa
i
lure whe
n
m
e
rgin
g
co
m
mon an
c
e
s
tors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[P
A
TCH] M
a
ke git-appl
y
unde
r
stand incom
p
let
e
li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree