repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Makefile: Add TAGS and tags targets
2006-03-18
Fredrik K
u
i
v
inen
Makefil
e
:
Ad
d
TAGS and tags targe
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
redrik
K
uivinen
blam
e
: Fix git-
b
lame <dir
e
ctory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik K
u
ivinen
blame
:
Nicer
o
utpu
t
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
blame: R
e
n
a
me detection (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik K
u
ivinen
r
e
v-lib: Ma
k
e it
e
asy to do
r
e
n
a
me tr
a
cki
n
g (take 2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredr
i
k
Kuivi
n
e
n
Ma
k
e
it possible to
not cl
o
bb
e
r
o
b
ject
.
util
i
n
sort_i
n
_
to
p
ol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik Kuivine
n
Nicer o
u
tput
f
ro
m
'gi
t
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
Remove traili
n
g
d
ot
a
fter short description
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredrik Kuivinen
F
i
x some inconsistenc
i
e
s
in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fredrik Kuivin
e
n
git-blame: Use the same tests for git-blame as
for
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-05
Fredrik Kuivinen
git-
b
lame: Make
the
output human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
Fredrik Kuivi
n
en
git-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
F
r
edrik K
u
i
vinen
Add gi
t
-bla
m
e, a tool for assigning b
l
ame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
F
r
edrik Kuivinen
s/SHELL/SHELL_PATH/ in Makefile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredr
i
k
Kuiv
i
n
e
n
merge
-
recursive: Speed up comm
i
t
gra
p
h
construction
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Kuivinen
merge
-
recursive: Make use o
f
provided base
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
Kuivin
e
n
git-branch: Documentation fi
x
es
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
edrik Ku
i
vinen
merge-recursive: Improve
t
he
e
rror
message
printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuiv
i
nen
g
i
t-whatchanged:
Add
usage st
r
ing
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik Kuivinen
git
-
l
og: Add usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Ku
i
vi
n
en
git-diff: Usage stri
n
g clean-up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fredri
k
Ku
i
vinen
U
s
age message cl
e
an-up, t
a
ke #2
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kui
v
inen
N
e
w test cas
e
: Cr
i
ss-cr
o
ss merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Ku
i
vinen
New test case: merge with directo
r
y/file co
n
f
l
icts
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fre
d
rik Kuivinen
test-l
i
b
.
sh:
A
d
d
new function, test_expect_co
d
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fred
r
ik Kuivinen
g
i
t-m
e
rge: Exit w
i
t
h code 2
i
f no strateg
y
was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
F
redrik Kuivinen
me
r
ge-recursive: Replace 'except:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivinen
merge-recursive: Use '~' inst
e
a
d
of '_
'
t
o sep
a
ra
t
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik K
u
ivinen
merge-recursive: Add co
p
yrig
h
t notic
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredr
i
k Kui
v
inen
merge-recursive: I
n
dent the outp
u
t
pro
p
erly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredri
k
Kuiv
i
n
e
n
merge-re
c
u
r
sive: Fix support for branch name
s
contain
i
ng
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredrik
K
u
i
vinen
merge-rec
u
rsiv
e
: F
i
x li
m
ited
o
utput of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
Fredrik Kuivine
n
merge-recurs
i
v
e
:
On
l
y print relevant re
n
a
m
e
messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
redrik Kuiv
i
nen
[PA
T
CH] Ena
b
le
and fix support for base les
s
merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fre
d
r
ik Kuivinen
[PATCH] Teac
h
git-l
s
-
f
iles
abo
u
t
'--'
t
o
d
e
n
o
te end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik Kuivinen
[PATCH] Teach
t
he recursive merge strategy a
b
o
ut renames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivi
n
en
[PATCH] More descript
i
ve
m
essages for co
n
f
li
c
t cases
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
ATCH] recur
s
ive-me
r
ge: Don't print a stack trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuiv
i
nen
[
P
A
TCH]
Use the 'die' function
where i
t
is appropriate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fred
r
ik
K
uivin
e
n
[
P
A
T
CH] Use a tem
p
orary in
d
ex file whe
n
we m
e
rge the
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[
PATCH] Adjust git-mer
g
e-recu
r
sive
.
py for
the new tool
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[P
A
T
C
H] Do
n
'
t output
'Automatic
merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fre
d
ri
k
K
u
i
vin
e
n
[PATCH] Be more like the 'resolve
'
s
t
rat
e
gy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivine
n
[PATC
H
]
Rena
m
e
the 'fredrik' merge strate
g
y
t
o 'recursive'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuiv
i
n
en
[PATCH]
Make the ProgramError
class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fre
d
ri
k
Ku
i
vinen
[
P
ATCH] M
a
ke sure w
e
d
i
e if we don't get enough argument
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[P
A
TC
H
] Int
r
oduce a
'
die' f
u
nction
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[P
A
TCH] Exit wit
h
status c
o
de 2
if we ge
t
an
e
xception
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivin
e
n
[PATCH
]
Fix assert
i
on failure whe
n
merging common ancestors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredri
k
Kuivinen
[PATCH] Make g
i
t-apply u
n
d
e
rstand in
c
omplete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree