repo.or.cz
/
git
/
jnareb-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 'jc/diff' into next
2006-03-11
Fredr
i
k Kuivinen
blame: Rename de
t
ection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredr
i
k
Kuivinen
rev-lib:
M
ake it easy to do r
e
name t
r
acking (take
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivin
e
n
M
a
ke
i
t possible to not clo
b
ber ob
j
ect
.
util in sort_in_
t
opol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
N
ice
r
output from '
g
i
t
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
edrik
K
uivinen
Remove trailing dot after shor
t
d
escription
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
Kuivinen
F
i
x some
i
nconsistencies i
n
th
e
docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivinen
git-blame: Us
e
t
he same
t
est
s
for git-bla
m
e
a
s fo
r
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredri
k
Kuivinen
git-blame:
M
ake
the outpu
t
human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fr
e
d
r
ik
K
uivinen
git-
b
l
a
m
e
,
ta
k
e 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fre
d
rik Kui
v
inen
Add gi
t
-
b
l
ame, a t
o
ol for ass
i
gning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredrik Ku
i
vin
e
n
s/SHEL
L
/SHE
L
L_PATH
/
i
n Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-
r
ec
u
rsiv
e
: Speed
up commit graph constru
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fred
r
ik Kuiv
i
ne
n
m
er
g
e
-recursi
v
e: Make use of prov
i
de
d
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
K
uivinen
gi
t
-branch: Documentation fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
Kuiv
i
ne
n
merge-rec
u
r
s
ive: Im
p
rove the error
m
es
s
age printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k Kuiv
i
nen
g
it-whatc
h
anged
:
Add
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredr
i
k
K
ui
v
inen
git-l
o
g:
Add usage
s
tring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
n
e
n
git-
d
i
f
f: Usage
s
tring
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fre
d
rik Kui
v
inen
Usage mes
s
age
c
lean-up
,
t
ake #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
ivinen
New test case: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
r
ik
Kuivinen
Ne
w
t
est c
a
se
:
m
e
rge w
i
th director
y
/file
con
f
licts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
tes
t
-
lib
.
s
h
: Add new function, t
e
s
t
_
e
x
p
ect_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
git-m
e
r
ge:
E
xit
w
i
t
h code 2 if
no
strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivinen
merge
-
r
ec
u
rsive: Repla
c
e '
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fr
e
drik Kuivinen
mer
g
e-recu
r
sive: Use '~' instead
of '_'
to separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kui
v
inen
me
r
ge-recursive: Add
copyr
i
ght
n
otic
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
Ku
i
vinen
m
e
rge-recursive: Indent the output
properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik K
u
ivinen
merg
e
-recursive: Fix su
p
port for branc
h
names containing
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
uivi
n
e
n
merge-recursive: Fix limited
o
u
tput
o
f rename
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Ku
i
vine
n
merge-recursive:
O
n
ly print relevan
t
re
n
ame messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Ku
i
vinen
[PATCH] Enable and fix s
u
pport for base l
e
ss me
r
g
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fr
e
drik Kuivinen
[P
A
TCH] Teach git-ls-fi
l
e
s
about '--' to d
e
note end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik K
u
ivinen
[PA
T
CH]
T
e
ach
t
h
e recursive merge
strategy about r
e
n
a
m
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivin
e
n
[PATCH]
M
ore descriptive m
e
ssage
s
f
o
r c
o
n
f
lict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredri
k
Kui
v
i
n
en
[
PATCH]
r
e
c
u
r
sive-merge: 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
F
r
e
d
rik Kuiv
i
nen
[PATCH] Use the 'die' func
t
ion wher
e
it is a
p
p
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivinen
[PATCH
]
Use a tempor
a
r
y
in
d
ex file when
w
e merge
t
he
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dri
k
Kuivinen
[PATCH] Adjust
g
i
t-merg
e
-recursive
.
p
y
for the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Don't outpu
t
'Aut
o
mati
c
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
u
ivin
e
n
[PATCH] Be more lik
e
th
e
'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k
Kuivinen
[
PATCH
]
Rena
m
e the 'f
r
edrik' me
r
ge
strate
g
y t
o
'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Make the ProgramError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[
PATCH
]
Make su
r
e we die
if we don
'
t get
e
noug
h
arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredri
k
Kuivinen
[PATCH] Introduce a 'die
'
f
u
ncti
o
n
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH] Exit
w
ith st
a
tus code 2 if we
get an exception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
iv
i
nen
[PATCH] F
i
x assertion failu
r
e when mergi
n
g c
o
mmon ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
F
red
r
ik Kuivinen
[
P
ATC
H
]
M
ak
e
git-apply u
n
d
e
r
s
tand
inc
o
mplete lin
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree