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 early parts of branch 'ls/am'
2006-06-17
F
r
edrik Kuivinen
bl
a
me: Add --time
t
o produce
r
a
w
times
t
amps
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-16
Fr
e
drik Kuivinen
U
pdate the documentation for
git-merge-ba
s
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
Fr
e
d
rik
Kui
v
in
e
n
blame:
Fix path pruning
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivin
e
n
Makefi
l
e: Add TAGS and
ta
g
s targets
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fr
e
drik Kuivin
e
n
blame:
Fix
g
it
-
blame <directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik K
u
ivinen
blame: Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kui
v
inen
blam
e
: Rename
d
et
e
cti
o
n (
t
ake 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fre
d
rik Kuivinen
r
ev-lib:
Make it eas
y
to do
rename
tracking (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fr
e
drik
K
u
i
vine
n
Make it
p
ossible to
not clobber object
.
util in sort_in_top
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Nice
r
o
u
t
p
u
t fr
o
m 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
r
edr
i
k Kuiv
i
nen
R
e
m
o
ve trailing do
t
af
t
er sh
o
rt description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Fix so
m
e inc
o
nsist
e
ncies in the do
c
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fr
e
drik Kuivinen
git
-
blame
:
U
s
e
the
same tests fo
r
git
-
blame as for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik
K
uivi
n
en
g
it-blame: Make the o
u
tpu
t
hu
m
an readab
l
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fre
d
rik Kuivinen
git-blame, take
2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fre
d
rik Kuivinen
A
dd
git-blame, a to
o
l for
assigning
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fre
d
rik Kuivin
e
n
s/SHEL
L
/SHELL_P
A
TH
/
in
Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuiv
i
nen
merge-r
e
cu
r
sive: Speed up commit graph constructi
o
n
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fre
d
r
i
k K
u
ivinen
merg
e
-
r
ecur
s
ive: Make u
s
e o
f
pro
v
ide
d
base
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik Kuivinen
g
i
t-branch:
D
ocumentat
i
o
n
fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fred
r
ik
K
uiv
i
n
e
n
merge-r
e
cu
r
sive
:
Improve the
e
rror message printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivi
n
en
git-whatchanged: Add usage s
t
rin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git-lo
g
: Add usag
e
strin
g
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fre
d
rik Kuivinen
git-diff: Usage strin
g
clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredrik Kuivinen
Usag
e
message clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
redrik Kuivin
e
n
New t
e
s
t
case: Criss-
c
ross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik
K
uivi
n
e
n
Ne
w
test case: me
r
ge
w
it
h
direc
t
ory/f
i
le conflicts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuiv
i
ne
n
test-li
b
.
sh: Add
n
ew func
t
ion, test_expe
c
t_code
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik
K
u
i
vinen
git-merge:
E
x
it 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
Fredrik Kuivinen
merge
-
recurs
i
v
e:
Replace 'exc
e
pt:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
vinen
merge-recurs
i
ve: Use '~'
i
nstead of '_' to
separate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Ku
i
v
inen
mer
g
e
-
recursive: Add copyright notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fre
d
rik Kuivinen
merge-recur
s
ive: Indent
t
he output properl
y
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
ui
v
inen
me
r
ge-recursive: Fix support for bran
c
h names conta
i
ning
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik Kuivinen
merg
e
-recu
r
sive: Fix li
m
ited o
u
tput of re
n
ame messag
e
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fred
r
ik
K
uivinen
merge-recursive:
Only print relevant ren
a
me messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
Fredrik Ku
i
v
i
nen
[PATCH] Enable and
fix support
for
base less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredri
k
Kuivinen
[
P
AT
C
H
] Teach git-ls
-
files abo
u
t '--'
t
o
d
enote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredr
i
k Kuivinen
[PATCH] Te
a
ch the
r
ecursiv
e
m
erge strateg
y
ab
o
u
t
r
e
n
a
m
es
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[PAT
C
H] M
o
r
e
de
s
crip
t
iv
e
messages for con
f
lict cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik
K
uivinen
[
PAT
C
H] recursi
v
e-merge: Don't p
r
int
a stack
t
r
ace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[PATCH] Use
t
h
e 'die' function
w
here it is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivine
n
[
PATCH] Use
a
temp
o
rar
y
index f
i
le when we merg
e
the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
ed
r
ik
K
uivinen
[PATCH] Adjust git-mer
g
e-rec
u
rsive
.
p
y
for th
e
new
t
o
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
rik Kuivinen
[PATCH] Don't
o
utput 'Automatic me
r
ge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
drik K
u
ivinen
[PATC
H
] Be mo
r
e like the 'resolve' strategy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivin
e
n
[PATCH] Rename the 'fredrik'
m
erge strat
e
gy to 'recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edr
i
k K
u
ivinen
[PATCH]
M
ak
e
the Pr
o
gramE
r
ro
r
c
lass pr
i
ntable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik Kuivinen
[
PATC
H
] Make sure we die if we don't get enough ar
g
uments
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
redrik
K
uivinen
[PAT
C
H] Introduce a
'die' function
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH] Exit with stat
u
s code 2 if we g
e
t an except
i
on
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fr
e
d
rik Kuivinen
[
P
ATCH] Fix assertion
f
ailure when
m
ergi
n
g co
m
mon ancest
o
rs
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivine
n
[PATC
H
] Make git-apply understand inc
o
mplete
l
in
e
s
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree