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
Merge branch 'jc/apply'
2006-05-16
Fredrik Kuivinen
Up
d
ate the documenta
t
ion for git-m
e
rge
-
base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fredrik K
u
ivi
n
e
n
blame: F
i
x path pruni
n
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik K
u
ivinen
Makef
i
le: Add TAGS and tags targ
e
ts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redri
k
Kuiv
i
nen
blame:
F
ix git
-
blame <d
i
rector
y
>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fred
r
i
k
Kuivinen
blame: Ni
c
er o
u
tput
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
bl
a
m
e: R
e
name de
t
ection (t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik K
u
ivine
n
rev-lib: Make it easy
t
o do
rename tracking (take
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fred
r
ik Kuivinen
Make it possi
b
le t
o
not clobber obj
e
c
t
.
util i
n
sort_in_t
o
pol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Nicer
output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fre
d
rik Kuivinen
Remove trai
l
in
g
do
t
afte
r
sh
o
rt description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redri
k
Kuiv
i
nen
Fix some i
n
consistencies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fre
d
r
i
k
K
uivinen
git-blame: Use th
e
same tests
f
or g
i
t-blame
a
s
f
o
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fr
e
drik Kuivinen
git-blame:
Mak
e
the outp
u
t h
u
man
readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fr
e
dr
i
k Kuivinen
git-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
redrik Kuivin
e
n
Add git-blame, a tool for
a
ssignin
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Kuivinen
s/SHELL/
S
H
ELL_
P
ATH/ in Makefil
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
ui
v
inen
merge-recu
r
sive: Speed
up
c
o
m
mit gr
a
ph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
F
redrik Kuivinen
merge-recur
s
i
ve:
M
ake
u
se of
p
rovided b
a
ses
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fr
e
drik Kuivi
n
en
git-b
r
a
nch
:
Do
c
umentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
K
uivine
n
me
r
g
e-
r
ecursive: Imp
r
ove the error m
e
ssage printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik K
u
ivinen
git
-
whatchanged: Add
usage
s
tring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuivi
n
en
git-log: Add
usa
g
e string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fred
r
ik Kuivinen
g
it
-
diff
:
Usage
s
tring clea
n
-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik
K
u
i
vinen
Usage me
s
sag
e
clean-up
,
take #2
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Ku
i
vinen
New test case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivinen
New test case
:
merge with dir
e
ctor
y
/file conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredr
i
k Kuivinen
test-lib
.
sh:
A
dd new fun
c
tion, test_e
x
p
e
c
t
_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
Kuivi
n
en
git-mer
g
e: Exi
t
wi
t
h
code 2 if no strategy
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fred
r
ik Kuivinen
merge-recur
s
ive: Replace
'
e
x
cep
t
:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik K
u
ivinen
merg
e
-re
c
urs
i
ve: Use '~' instead o
f
'_' to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kui
v
i
n
en
merg
e
-
recursive:
A
dd
copyright
n
otice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-
r
ecursive:
Indent
t
he output proper
l
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
Kuivinen
mer
g
e-
r
ec
u
rs
i
ve: Fix
s
upport for branch names cont
a
inin
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Ku
i
vinen
m
erge-recursive: Fix limi
t
ed output of re
n
ame messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuiv
i
ne
n
merge
-
recursive: On
l
y pr
i
nt rele
v
ant rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivinen
[PATCH]
Ena
b
l
e
an
d
fi
x
su
p
po
r
t for base
l
e
ss mer
g
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivinen
[PATCH
]
Tea
c
h
git
-
ls-files ab
o
ut '--' to
d
enote e
n
d
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Te
a
c
h the recursi
v
e merg
e
strategy about renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kui
v
inen
[
P
ATC
H
] More de
s
cript
i
ve messages for conflict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fr
e
d
r
ik Kuivinen
[
P
ATCH] recursive-merge:
Don't pr
i
nt a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k Ku
i
vinen
[PATCH
]
Use t
h
e 'die' funct
i
on where it is appropri
a
te
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivi
n
e
n
[PATCH]
Us
e
a
temporary in
d
ex file
when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredr
i
k
Kuivin
e
n
[PATCH] Adjust gi
t
-merge
-
recursive
.
p
y
f
or the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivin
e
n
[PATCH]
Don't output 'Automa
t
ic
m
erge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATC
H
]
Be m
o
r
e like the 'resolve' st
r
ateg
y
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH]
R
enam
e
the 'fr
e
drik
'
merge strategy
t
o
'
recursi
v
e'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[PATCH] Make the ProgramE
r
ror class p
r
intable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
drik Kuivinen
[PATCH] Make
s
ure we die if we don
'
t get e
n
oug
h
argum
e
nts
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Intro
d
uc
e
a 'die
'
fun
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kui
v
inen
[PATCH] Exit with
status co
d
e 2 if
w
e get
a
n e
x
c
e
ption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kui
v
ine
n
[PATCH] Fix asserti
o
n failur
e
when m
e
rging com
m
on
a
ncesto
r
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fred
r
ik Kuivinen
[PATCH] Make git-
a
pp
l
y unde
r
st
a
n
d
incomple
t
e lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree