repo.or.cz
/
tgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Prevent bogus paths from being added to the index.
2006-05-16
Fredrik
Kuivin
e
n
U
pd
a
te the
d
ocumentation
f
o
r
git-merge-base
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-05-04
F
r
e
d
r
i
k
Kuivine
n
bla
m
e: F
i
x path prun
i
ng
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-18
Fredrik Kuivinen
Makefile
:
Add TAGS
a
nd tag
s
targ
e
t
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
F
r
edr
i
k
K
u
i
v
inen
blame
:
F
ix gi
t
-bl
a
me
<directory>
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-17
Fredrik Kuivinen
blame:
Nicer output
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredrik Kuivinen
bl
a
m
e: Rename de
t
ection (tak
e
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fre
d
r
ik
Kuivinen
rev-lib: Make it easy to do rename tracking (
t
ake
2)
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-11
Fredri
k
Kuivinen
Ma
k
e it possibl
e
to n
o
t clobbe
r
object
.
util in
sort_in_topol
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fredr
i
k Kuivi
n
en
Nicer outpu
t
f
r
om 'git'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
Fr
e
drik
K
uivinen
Remove trailing dot after
s
hort descrip
t
ion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-09
F
redrik K
u
ivinen
Fix some incon
s
is
t
encies in the docs
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-06
Fr
e
dri
k
Kui
v
inen
g
i
t
-blame: U
s
e
the
sa
m
e
tests for git-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-blam
e
: Make t
h
e
output human readable
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-03-02
F
r
edrik Kui
v
inen
git-blame, take 2
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-21
Fredr
i
k Kuivinen
Add git-b
l
ame,
a
t
ool for assigni
n
g
blame
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-14
Fred
r
ik K
u
ivinen
s/SHELL/SH
E
LL
_
PATH/ in Ma
k
efile
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik Ku
i
v
i
nen
m
erge-recu
r
si
v
e: Sp
e
e
d
up co
m
mit graph c
o
nstru
c
tion
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-02-02
Fredrik
K
uivine
n
merge
-
recur
s
i
ve: Make us
e
o
f
provided bases
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
F
r
e
drik Kuivinen
git-branc
h
:
D
ocumen
t
a
tion fixe
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2006-01-29
Fredrik
Kuivin
e
n
m
e
rge-recursive:
I
m
p
rove the err
o
r mes
s
age printed
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredrik
K
u
ivinen
git-wh
a
t
changed: Add
u
sage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fr
e
drik Kuivin
e
n
git-lo
g
: Add
usage string
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-16
Fredri
k
Ku
i
vinen
git-diff: Usage string clean
-
up
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-14
Fre
d
rik Kuivinen
Usage mes
s
age clean-up, take #2
commit
|
commitdiff
|
tree
2005-12-03
F
redr
i
k Kuivi
n
en
New
t
est
c
a
se: Criss-cross merge
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fr
e
d
r
ik Kuivinen
New test c
a
se: merge with directory/
f
i
l
e
co
n
flict
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredri
k
K
uivinen
test-li
b
.
sh:
Add new function, test_ex
p
e
c
t_cod
e
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-12-03
Fredrik Kuivinen
git-merge: Exit
w
ith code
2 if no strategy was able
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-20
Fredrik Kuivine
n
merg
e
-recursive: Replac
e
'
e
xcept:'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredri
k
Kuivinen
merge-recursi
v
e:
Use '~' instead of '_' to sep
a
rate
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
Fredrik Kuivin
e
n
merge-recursive: Ad
d
copyr
i
ght notice
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-12
F
r
edrik Kuivinen
merge-recursi
v
e: Indent
t
he output properly
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
Fredr
i
k Kuivinen
merge-r
e
cursive: F
i
x
s
upport for branch names
c
o
ntaini
n
g
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-09
F
r
e
d
rik Kuivinen
merge-recursive: Fix li
m
it
e
d
o
u
tpu
t
of rename messages
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-11-08
F
r
edrik
K
uivin
e
n
merge-rec
u
rs
i
v
e: Only print
relevant r
e
n
a
m
e
message
s
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-03
F
r
edr
i
k
K
u
ivinen
[PATCH] Enable and
f
i
x su
p
por
t
for b
a
s
e less merges
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
Kuivi
n
en
[PA
T
C
H
] Tea
c
h
g
it-ls-f
i
les
abou
t
'--' to denote end
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-10-02
Fredrik
K
u
i
vinen
[PATCH] Tea
c
h
the recursive merge strategy a
b
out re
n
ames
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredrik Kuivinen
[
P
ATCH] More d
e
scri
p
tive messages for
c
o
nflict c
a
ses
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-25
Fredr
i
k Kuivinen
[PATCH]
r
ecursive-
m
erge: Don'
t
pr
i
nt a sta
c
k trace
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] U
s
e the
'
die' functio
n
w
h
ere it is appropr
i
ate
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PATCH] Us
e
a
temporary i
n
d
e
x
file
whe
n
we merge t
h
e
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredrik Kuivinen
[PA
T
CH] Adj
u
st git-m
e
r
ge-re
c
u
rsive
.
p
y for the new
to
o
l
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fredri
k
Kuivinen
[
P
ATCH] Don't o
u
tput 'Automat
i
c merge failed,
.
.
.
'
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
Fr
e
dr
i
k Kuivinen
[
PA
T
CH] Be more li
k
e the 'resolve' stra
t
egy
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-13
F
r
edrik Kuivinen
[
P
A
T
C
H
]
Rename the 'fredrik' merge
strate
g
y to 'recursiv
e
'
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PATCH] Make
th
e
Pr
o
gramError class printable
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
r
edrik Kuivinen
[P
A
TCH] Make
s
ure
w
e
die if we don't get enough
a
r
g
u
me
n
t
s
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik Kuivi
n
en
[PA
T
C
H] Int
r
oduce a 'die' f
u
nc
t
ion
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
F
re
d
rik K
u
ivi
n
en
[PAT
C
H
]
E
x
it with
s
tatus code
2
if we
g
e
t an ex
c
eption
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-12
Fredrik
K
uivinen
[PAT
C
H] Fix assertion failu
r
e when merging common ance
s
tors
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree
2005-09-04
Fredrik Kuivinen
[PATCH] Mak
e
git-apply
u
nderstand i
n
comp
l
ete lines
.
.
.
Signed-off-by:
Fredrik Kuivinen
<freku045@student.liu.se>
commit
|
commitdiff
|
tree