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
git-svnimport: Improved detection of merges.
2006-05-16
Fredrik Kuivinen
Update th
e
docu
m
entat
i
on fo
r
g
i
t-merge-
b
ase
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
blame: Fix pat
h
pr
u
ning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivine
n
Makefi
l
e: Add TAGS and
t
ags t
a
r
g
ets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edri
k
Kuivinen
blame: Fix
git-blame <dire
c
tory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuiv
i
nen
blame: Nicer
output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
redrik Kuivinen
blame: Rename detection (
t
ake 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edrik Kuivinen
r
e
v-lib: Make it easy to d
o
rename tracking (t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik Kuivinen
Make
it p
o
ssi
b
le to not clobb
e
r
object
.
uti
l
in so
r
t_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
drik Kuivinen
Ni
c
er
output
f
rom 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
edrik K
u
iv
i
nen
R
emo
v
e trai
l
i
n
g
dot after
s
h
or
t
description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik
K
uivinen
F
i
x some inconsisten
c
i
es in the doc
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git
-
blame: Use
the same
tests for git-bla
m
e a
s
for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
F
r
edrik Kuivinen
gi
t
-bla
m
e: Mak
e
the
o
utp
u
t human
re
a
dable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fr
e
drik Kuivin
e
n
git-bl
a
m
e
, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
Add
g
it-blame, a
t
ool for as
s
igning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
ed
r
i
k Kuivine
n
s/SHELL/SHELL_
P
A
TH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-recursive: Speed up co
m
mit g
r
aph co
n
struction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
r
edr
i
k Kui
v
in
e
n
merge-recursi
v
e: Mak
e
use of pro
v
ided
b
ases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredri
k
Kuivinen
gi
t
-branch:
D
o
c
umentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
e
drik
K
uivinen
merge-recursive: Im
p
rove the e
r
ror
m
essa
g
e prin
t
ed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-wha
t
changed: Ad
d
usage st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivinen
git
-
log: A
d
d usage st
r
i
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
F
r
edrik Ku
i
vine
n
g
i
t
-
diff: U
s
age s
t
ri
n
g clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
F
redrik
Kuivinen
Usage message clean-up,
take #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
New test cas
e
: C
r
iss
-
cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik K
u
ivinen
New t
e
s
t case: merge
with di
r
ectory/file
c
onflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
test-lib
.
s
h:
A
d
d
new func
t
ion, test_exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Ku
i
vinen
git-
m
erge:
E
xit with
code 2 if no s
t
ra
t
egy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivi
n
en
merge-recursive: R
e
p
lace 'e
x
c
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivine
n
merge-r
e
c
ursive: Use
'
~' instead of '_' to separat
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuiv
i
nen
mer
g
e-re
c
ursive
:
Add copyright noti
c
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edri
k
Kuivi
n
en
merge-recur
s
iv
e
: In
d
e
n
t the out
p
ut properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
m
e
r
ge-recursive:
F
i
x
support for br
a
nch names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
ivinen
merg
e
-r
e
cursive:
F
ix limit
e
d
o
utput o
f
r
enam
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredr
i
k
Kui
v
inen
m
erge-recurs
i
ve: Only print
r
elev
a
nt rename
m
e
s
sages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik K
u
ivinen
[PATCH] Enable and f
i
x sup
p
ort for base les
s
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[PATCH] T
e
a
ch git-ls-files about '--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
F
r
edrik Ku
i
vi
n
en
[PATCH] Teach the
recurs
i
ve me
r
ge strate
g
y about ren
a
mes
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
F
r
e
d
rik Kuiv
i
nen
[PATC
H
] More descriptive me
s
sages for conflict c
a
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
v
i
nen
[PA
T
CH] recursive-me
r
ge: Don't pri
n
t a stack t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Use the 'die' functi
o
n w
h
ere it is
a
ppropriat
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
iv
i
n
e
n
[PA
T
C
H
] Use a temporary
ind
e
x file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[
PA
T
CH
]
Adjus
t
git-
m
erge-
r
ecursive
.
p
y
f
o
r the new to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH] Don
'
t
output 'Auto
m
atic
merge
f
ailed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Be mor
e
like the 'resolve' stra
t
egy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivine
n
[PATCH] Rename
the 'fredri
k
' merge strategy
to
'
r
e
curs
i
ve'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATC
H
]
Mak
e
the ProgramError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
rik K
u
ivinen
[PA
T
CH] M
a
ke sure
w
e die if w
e
do
n
't get enough arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Introduce
a
'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[
PATCH]
Exi
t
w
ith st
a
tus
c
ode 2 if
w
e
g
et an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edr
i
k Kuivinen
[PATCH] Fix assertion fai
l
u
r
e when merging comm
o
n ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik
Kui
v
i
nen
[PATCH] M
a
ke git-appl
y
u
nders
t
and incomplete li
n
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree