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
Merge branch 'master' into next
2006-06-17
F
r
edrik Kuivinen
blame: Add --time to pr
o
duce raw t
i
mestamps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fr
e
drik Kuiv
i
nen
Update the
documentat
i
o
n
fo
r
git-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
F
r
edrik Kuivi
n
en
blame: Fix pa
t
h prunin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fre
d
ri
k
Kuivinen
Makefile: Add TAGS and tags t
a
rge
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuiv
i
nen
blame: Fix
g
it-blame <direct
o
r
y
>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
bl
a
m
e
: Nicer o
u
tput
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
i
k
K
uivinen
bl
a
m
e
:
Rename detecti
o
n (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Ku
i
v
inen
rev-lib: Make it easy
t
o do rename tr
a
cking
(
take
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
r
edrik Kuivinen
M
a
ke it possib
l
e
t
o no
t
c
l
o
bb
e
r object
.
util
i
n s
o
rt_
i
n
_
topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
uivinen
Nicer outp
u
t from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Rem
o
ve trailin
g
d
o
t
after short descrip
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fi
x
s
ome inco
n
sistencies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
F
r
edr
i
k Kuivinen
git-bla
m
e
:
Use the same
t
ests
for
g
it-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-
b
l
a
m
e
:
M
a
k
e t
h
e o
u
t
p
u
t
h
u
ma
n
readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik
K
u
i
vinen
g
it-blam
e
, t
a
ke 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredrik Kuivinen
A
d
d git-
b
lame, a
t
ool
f
or assigning blam
e
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredr
i
k Kuivinen
s
/
SH
E
LL/SHE
L
L_
P
ATH/ in Make
f
ile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivin
e
n
merge-recursive: Speed up co
m
mit
g
r
a
p
h construct
i
on
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
m
erge-recur
s
iv
e
:
Mak
e
use
of
p
rovided
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik K
u
iv
i
nen
git-branc
h
: Documentation
f
ixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
m
erge-recursive: Improve the
e
rr
o
r message prin
t
ed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Kuivinen
git-whatchanged
:
Ad
d
u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kui
v
ine
n
g
it-log:
Add usag
e
str
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivine
n
gi
t
-diff: Usage str
i
n
g clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usag
e
message cl
e
an-up,
t
ake
#
2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
Ne
w
test case: Criss-cross m
e
rge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
dri
k
Kuivin
e
n
New test
c
as
e
: merge w
i
th
direc
t
o
r
y/file
c
o
nf
l
i
ct
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivi
n
e
n
test-li
b
.
sh: Add n
e
w func
t
ion,
tes
t
_expect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuiv
i
nen
git-merge: Exi
t
with code
2 if no strategy was abl
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredri
k
Ku
i
v
inen
me
r
g
e
-
recursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vinen
merge
-
recursive: Use '~' inst
e
ad of '_
'
to se
p
arate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
merge-rec
u
r
s
i
ve:
A
d
d
co
p
yri
g
h
t n
o
tice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
m
e
r
g
e-recur
s
ive:
Indent the
output pr
o
p
e
r
ly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
edrik Kuivinen
m
e
rge
-
recurs
i
ve: Fix
support
f
o
r
branch names containi
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
mer
g
e-r
e
cursive: Fix lim
i
ted output of rename
m
essag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fre
d
rik
Kuivinen
m
e
r
ge-recursive: Only print rel
e
vant rename m
e
ssages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik
K
uivinen
[PATCH] Enable and fix sup
p
ort for base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[
P
AT
C
H] Teach git-l
s
-f
i
les about '--' to
denot
e
e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
iv
i
nen
[PATCH] Teac
h
the recursive m
e
rge strategy a
b
out renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivin
e
n
[
PA
T
CH] More de
s
criptive mess
a
g
e
s for conflict cas
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Ku
i
v
i
ne
n
[PATCH] recursive-merge: Do
n
't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[PAT
C
H
]
Use
t
h
e
'die' function where it
is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
TCH] Use
a tem
p
o
rary index fi
l
e when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] A
d
just
git
-
m
e
rge-recursive
.
py f
o
r the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Kuivinen
[
PATCH
]
Don't out
p
ut 'Auto
m
at
i
c merge
f
ailed
,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH] Be more like the 'r
e
solve'
strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivin
e
n
[
P
ATC
H
]
Rename the 'fre
d
r
i
k' m
e
rg
e
st
r
a
t
eg
y
t
o 'recu
r
sive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[
PATCH] Make the Pr
o
g
ramError clas
s
p
rintable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Make su
r
e w
e
die if
we don't get enoug
h
a
r
g
u
men
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivine
n
[PATCH] Intro
d
uce a
'die' functio
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivi
n
e
n
[PATCH] Exi
t
w
ith status cod
e
2
if
w
e g
e
t an excep
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH] Fix assert
i
on failure when merg
i
ng commo
n
ances
t
ors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Ku
i
vin
e
n
[PA
T
CH] Make
g
it-apply underst
a
nd incomplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree