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
git-svnimport: if a limit is specified, respect it
2006-03-18
Fredrik Kuivinen
Makef
i
le: A
d
d TAGS and tags targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fre
d
r
i
k
Kuivinen
b
l
ame: Fix git-bl
a
me <direc
t
ory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik Kuivinen
blame: Nicer out
p
ut
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
blame
:
Re
n
ame
d
etec
t
ion (t
a
ke 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
F
redrik
Kuivinen
rev-lib: Make i
t
easy to do rename t
r
ac
k
ing (tak
e
2
)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fre
d
rik Kui
v
inen
Make i
t
p
o
s
si
b
le to not clob
b
er object
.
util
i
n sor
t
_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
dri
k
K
uivine
n
Nicer output from 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik
K
ui
v
inen
Remove trailing dot after short
description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
d
r
ik
K
uivinen
Fix some in
c
onsistencies in t
h
e docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fre
d
rik Kuivinen
git-bl
a
me: Us
e
th
e
same
t
ests
for
g
it-blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredr
i
k Kuivinen
git-
b
l
ame: Make t
h
e
ou
t
put
h
u
man
rea
d
able
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik
K
uivinen
git
-
blame, tak
e
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fr
e
d
r
ik Kuivinen
Add git-blam
e
,
a tool for assigning blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fredri
k
Kuivinen
s/SHELL/SHE
L
L_PATH/ in Mak
e
file
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
me
r
g
e-recu
r
si
v
e: Speed up commit g
r
aph construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge-
r
e
cu
r
sive: Make
u
s
e
of provi
d
e
d
bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
git-branch:
D
ocum
e
n
t
a
tion fixes
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
edrik Kuivinen
merge-recursive: Imp
r
ove the error
m
es
s
ag
e
printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-whatchanged: A
d
d u
s
age string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-log:
A
dd usage s
t
ring
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kui
v
ine
n
git-di
f
f: Usage
s
tring clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usage message
clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivine
n
New test
case
:
Criss-c
r
o
s
s merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
ri
k
Kuivinen
Ne
w
test case: merge
w
i
t
h directory/f
i
l
e
conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik K
u
i
v
i
nen
test-lib
.
s
h: Add new funct
i
o
n
,
t
est_exp
e
ct_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
r
ik
K
uivinen
git-m
e
rge: Ex
i
t with c
o
de 2
i
f no strategy
was
a
b
le
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik
K
ui
v
inen
merge
-
recurs
i
ve: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
e
d
ri
k
K
u
i
vi
n
en
merge-recurs
i
ve: U
s
e '~'
i
nstead
o
f '_' t
o
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik
K
u
i
v
inen
merge-recursive: Add cop
y
right notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-re
c
ursive: Indent the output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fr
e
drik
Kuivinen
me
r
ge-recurs
i
v
e
: F
i
x support for branch
n
ames con
t
aini
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
m
e
rge-recu
r
s
i
v
e: Fi
x
limited
o
utput
of
ren
a
m
e
messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivinen
me
r
ge
-
recu
r
siv
e
: On
l
y print
r
elevant re
n
am
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Kuivi
n
e
n
[PAT
C
H
]
En
a
ble
a
n
d fix support for base less
merg
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
uivinen
[
P
AT
C
H]
Teach git-ls-
f
iles about '--' to den
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach the
r
e
c
ursive me
r
ge
s
trate
g
y
about renam
e
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PATCH] More descript
i
ve messages
f
or conflict ca
s
es
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuiv
i
nen
[PATCH]
recurs
i
ve-m
e
rge:
D
on'
t
print a stack
t
rac
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
i
k Kuiv
i
nen
[PATCH] Us
e
the 'die' function where
i
t is app
r
opriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PAT
C
H] Us
e
a temporary index file when we merge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik K
u
ivinen
[PATCH] Ad
j
ust
g
it
-
merge-recu
r
sive
.
py for
t
he
new t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
redrik Kuivi
n
en
[
PATCH]
Don't outp
u
t 'Auto
m
a
t
ic
merg
e
f
ail
e
d,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik
K
uivinen
[
P
ATCH] Be more
l
i
k
e the '
r
es
o
l
ve' st
r
ategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] R
e
name the 'fredrik' m
e
rge
s
t
r
at
e
g
y to
'
recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Make the ProgramError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik K
u
ivinen
[
P
ATCH] Make sure we die if we do
n
'
t
get
e
no
u
gh arguments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredr
i
k
Kuivinen
[PATCH] Introduce a
'
die' fun
c
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fred
r
ik
Kuivinen
[PATCH] Exit with stat
u
s
code 2
i
f we get a
n
exce
p
tion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivinen
[PATCH]
Fix a
s
ser
t
ion fail
u
re when me
r
g
i
n
g
c
ommon an
c
estors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
Kuivine
n
[PATCH
]
M
ake
git
-
a
p
ply und
e
r
stand
i
n
c
omplet
e
lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree