repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make "read-tree" know how to do a "1-way merge".
2005-04-19
Lin
u
s Torvalds
Make "read-tre
e
" know
ho
w
to do a
"
1-wa
y
merge"
.
commit
|
commitdiff
|
tree
2005-04-19
Linus T
o
rvalds
Make "read-tree" take
the 'stat' information f
o
r
a
.
.
.
commit
|
commitdiff
|
tree
2005-04-19
Linus
T
orvalds
Make git-pu
l
l-
s
c
r
ipt do
t
he right thing for
symlinked
.
.
.
commit
|
commitdiff
|
tree
2005-04-19
Linus
Torvalds
Don't parse
c
ommit objec
t
s mo
r
e th
a
n once
.
commit
|
commitdiff
|
tree
2005-04-19
J
ames B
o
ttomle
y
[PATCH] SCSI
t
ree
s
, merge
s
and git s
t
atu
s
commit
|
commitdiff
|
tree
2005-04-19
G
r
eg KH
[P
A
TCH] prov
i
de bett
e
r committer info
r
mation
t
o commit
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-19
Linus Torva
l
ds
Make
fs
c
k-cache p
r
i
n
t the object type
f
or unreac
h
able
.
.
.
commit
|
commitdiff
|
tree
2005-04-18
Junio C Hamano
[
PATCH] show-diff: Remove
stale
commen
t
s
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Junio
C
H
a
m
ano
[PATCH] Do
n
ot let r
s
ync obliterate
.
gi
t
/object symbolic
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Junio C
Haman
o
[PATCH]
s
h
ow-diff
.
c: -R option fo
r
rev
e
rse diff
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Juni
o
C Hamano
[PA
T
CH
]
s
h
ow
-
d
iff
.
c: make diff op
t
ions customizable
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Junio C Hamano
[PATC
H
] show-diff
.
c: adjus
t
default format for the
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
J
u
nio C Hamano
[PATCH] show-diff
.
c: simplify show_diff
_
empty
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Junio C Haman
o
[PATCH] s
h
ow-diff
.
c: check unreadbale
b
l
o
b
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
J
uni
o
C
H
amano
[PA
T
CH] show-dif
f
.
c: cl
e
an up
p
r
ivate
b
uffer use
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Linus To
r
vald
s
Add "update-cache --refres
h
" to git-pull-sc
r
ipt
t
o
.
.
.
commit
|
commitdiff
|
tree
2005-04-18
L
in
u
s Torvalds
Ch
a
nge me
r
g
e
-cache and git-merg
e
-one-file to use the
.
.
.
commit
|
commitdiff
|
tree
2005-04-18
Linus
T
orvalds
Ad
d
"unpack-file" helper tha
t
unpacks
a sha1 blob into
.
.
.
commit
|
commitdiff
|
tree
2005-04-18
Linus
Torv
a
lds
Add more hea
d
er dep
e
nd
e
n
ci
e
s
.
commit
|
commitdiff
|
tree
2005-04-18
Linus Torvalds
Split up read-cache
.
c into more logic
a
l clumps
.
commit
|
commitdiff
|
tree
2005-04-18
L
i
nus Torval
d
s
Clean
u
p the Makefile a bit
.
commit
|
commitdiff
|
tree
2005-04-18
Linus Tor
v
ald
s
A
dd
the simple scripts I us
e
d to do a merge with
cont
e
nt
.
.
.
commit
|
commitdiff
|
tree
2005-04-18
L
inus Torvalds
Mer
g
e the new objec
t
model thing
from Daniel
B
arkal
o
w
commit
|
commitdiff
|
tree
2005-04-18
J
a
mes Bottomley
[PATCH] fi
x
bu
g
in read-cache
.
c wh
i
ch loses files
whe
n
.
.
.
commit
|
commitdiff
|
tree
2005-04-18
Daniel Barkalow
[PAT
C
H] Switch impl
e
mentations of
m
e
r
g
e
-base, port
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Daniel Bar
k
alow
[
PATCH] Port fsck
-
cache to
use pa
r
sing functions
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Daniel Barkal
o
w
[PATCH] Port rev-tree to par
s
ing functions
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Dan
i
el Bark
a
l
o
w
[PATCH] Implementations of parsing functions
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Daniel Barkalow
[PATCH] Header files for
o
b
ject parsing
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Junio C Haman
o
[
PATCH
]
Fix confusing behaviour of upda
t
e-cache --r
e
fresh
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Li
n
us Torvalds
U
p
d
ate README to re
f
lect the hierarchic
a
l tree objects
,
commit
|
commitdiff
|
tree
2005-04-18
Jun
i
o
C
H
amano
[PATCH]
(resen
d
) s
h
ow-diff
.
c
off-by-one fix
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Linus Torvalds
A
s
s a "merg
e
-cach
e
" helper program to
e
xecu
t
e a merge on
commit
|
commitdiff
|
tree
2005-04-18
Brad
Roberts
[
PATCH] f
o
rk optional branch point
no
r
mazilation
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-18
Linus
T
o
r
valds
Ignore any unmerged
e
ntries
f
or "
c
hecko
u
t-c
a
che
-
a"
.
commit
|
commitdiff
|
tree
2005-04-17
Linus Torvald
s
Re
m
ove extr
a
n
eous
',' ';' a
n
d '
.
' characte
r
s fr
o
m the
.
.
.
commit
|
commitdiff
|
tree
2005-04-17
Linus Torvalds
Make the re
v
ision
t
racking track the ob
j
ect
t
ypes too
.
commit
|
commitdiff
|
tree
2005-04-17
Linus Torvalds
Ma
k
e "commi
t
-t
r
ee" check the input
objects more care
f
ull
y
.
commit
|
commitdiff
|
tree
2005-04-17
Linus Torval
d
s
M
a
ke "parse_commit" return t
h
e "struct revision" f
o
r
.
.
.
commit
|
commitdiff
|
tree
2005-04-17
Linus Torvalds
Do a very simple "
m
erge-base" that finds the
most recent
.
.
.
commit
|
commitdiff
|
tree
2005-04-17
L
inus Torvalds
Make "r
e
v-tree
.
c" use the new-and-improved "mark_reach
a
b
l
e()"
commit
|
commitdiff
|
tree
2005-04-17
Lin
u
s Torvald
s
Make "revis
i
on
.
h" slightly bet
t
er to use
.
commit
|
commitdiff
|
tree
2005-04-17
Linus Torvalds
Move "par
s
e_co
m
mit()
"
into
c
ommo
n
rev
i
sio
n
.
h f
i
l
e
.
commit
|
commitdiff
|
tree
2005-04-17
B
r
ad R
o
berts
[PATCH] f
i
x for
memory
l
eak in write-tree
.
c
commit
|
commitdiff
|
tree
2005-04-17
Petr Baudis
[PATCH] Fix +x-relate
d
s
how-di
f
f false
p
ositives
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Junio C
H
am
a
no
[PATCH] Remove unused argum
e
n
ts from index_fd()
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Jun
i
o
C Hamano
[
P
A
TCH
]
Better error m
e
ssa
g
e from checkout-
c
ach
e
for
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Linus
T
orv
a
lds
Fix total
permission bo
g
osity in "checkout-cach
e
.
c"
.
commit
|
commitdiff
|
tree
2005-04-17
Junio C
H
am
a
no
[PATCH] update-c
a
che --re
m
ove marks the path merged
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Junio C Hamano
[PATCH] show-diff
.
c:
do not include u
n
us
e
d hea
d
er
f
ile
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Li
n
us Torvalds
B
e mu
c
h more liberal
abou
t
the file mo
d
e bits
.
commit
|
commitdiff
|
tree
2005-04-17
Junio C
Hamano
[PATCH] Do not run us
e
l
ess show-di
f
f on
un
m
erged
p
aths
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Junio C Hamano
[PATCH] show-diff style fix
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Junio
C
Hamano
[PA
T
CH] Rename conf
u
sin
g
v
ariable in sh
o
w-diff
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Junio
C
Hamano
[PATCH
]
show-diff shell safety
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
Junio C Ha
m
ano
[PATCH] sh
o
w-diff -z option for machine
r
e
adable output
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-17
J
u
nio
C Hama
n
o
[PAT
C
H] Optionally tell show-diff to sh
o
w
o
n
l
y named
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-16
Junio C H
a
mano
[PATCH]
U
n unop
t
imize ls-
t
re
e
be
h
a
viour
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-16
L
i
nus Torvalds
Add "--unmerged" flag
to "show
-
files",
w
h
i
ch does what
.
.
.
commit
|
commitdiff
|
tree
2005-04-16
L
i
nus To
r
valds
Remov
e
"
merge-tree
.
c"
commit
|
commitdiff
|
tree
2005-04-16
Linus To
r
va
l
ds
W
h
en inserting a
index entry
o
f
stage 0, remove
all
.
.
.
commit
|
commitdiff
|
tree
2005-04-16
L
inus Torvalds
Make 'rea
d
-
t
ree' do
a
f
ew m
o
re
o
f the tri
v
ial merge
.
.
.
commit
|
commitdiff
|
tree
2005-04-16
J
unio C
H
amano
[PATCH] Ad
d
-
-
s
tage to s
h
ow-files fo
r
new
s
t
age dircache
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-16
Junio C Hamano
[
PAT
C
H] B
y
teorder fix for rea
d
-
t
r
ee, new -m semantics
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-16
Linus Torvalds
Mak
e
"read-tr
e
e" mer
g
e the
t
rees
i
t
rea
d
s by gi
v
ing
.
.
.
commit
|
commitdiff
|
tree
2005-04-16
L
i
nus Torvalds
Make cache entr
y
compa
r
ison take the new "stat
e
" flag
.
.
.
commit
|
commitdiff
|
tree
2005-04-16
Linus Tor
v
alds
wr
i
te-tree: r
e
f
u
se to
w
r
ite out trees with unm
e
rged
.
.
.
commit
|
commitdiff
|
tree
2005-04-16
Linus Torvalds
E
n
code a few extra flags per index entry
.
commit
|
commitdiff
|
tree
2005-04-16
Lin
u
s Torvalds
Simpl
i
fy sho
w
-diff cac
h
e
e
n
t
ry name handling
.
commit
|
commitdiff
|
tree
2005-04-16
Junio C Ham
a
no
[PATCH] Add '-z' to merge-tree
.
c
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-15
Linus Torvalds
M
a
ke
"
dif
f
-tree" have similar behav
i
ou
r
as "
l
s-tree
.
.
.
commit
|
commitdiff
|
tree
2005-04-15
J
unio C Haman
o
[PATCH] Add "-q" o
p
tion to show-diff
.
c
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-15
J
uni
o
C Ham
a
no
[PATC
H
] Add -z opt
i
o
n
to show-fil
e
s
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-15
L
i
nus Torvalds
Add "--cacheinfo"
o
ption t
o
updat
e
-cache
.
commit
|
commitdiff
|
tree
2005-04-15
Linus Torvald
s
Conve
r
t the i
n
dex file rea
d
ing/writing to use network
.
.
.
commit
|
commitdiff
|
tree
2005-04-15
David Woodhous
e
[PATCH] Simp
l
ify date
h
andling
and make it more reliable
commit
|
commitdiff
|
tree
2005-04-15
Juni
o
C Hamano
[PATCH] ls-
t
r
ee enhanceme
n
ts
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-14
Linus
T
orvalds
A
dd
"
mer
g
e-tree" he
l
p
e
r
p
rog
r
am
.
Maybe it's retarded
.
.
.
commit
|
commitdiff
|
tree
2005-04-14
Linu
s
Torval
d
s
Use common "revision
.
h" header
for
b
oth fs
c
k and rev
.
.
.
commit
|
commitdiff
|
tree
2005-04-14
L
inus Tor
v
alds
Fix read-cach
e
.
c
c
o
llission ch
e
ck
logic
.
commit
|
commitdiff
|
tree
2005-04-13
L
i
n
us Torvalds
M
ake '
f
s
ck
'
able to take an arbitrary number of paren
t
s
.
.
.
commit
|
commitdiff
|
tree
2005-04-13
Linus Torv
a
lds
Make fsck reachability avoid doing
u
nnecessary
w
o
rk f
o
r
commit
|
commitdiff
|
tree
2005-04-13
L
in
u
s Torva
l
ds
Make "fsck-cache" use the same r
e
vision tracking structure
.
.
.
commit
|
commitdiff
|
tree
2005-04-12
Petr
Ba
u
dis
[P
A
T
CH] Fix a
crash w
h
en doing
r
ev-
t
ree
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-04-12
Linus Torvalds
Make "checkout-cache" si
l
ently skip up-to-date
files
.
commit
|
commitdiff
|
tree
2005-04-12
Linus Torvalds
Make "rev-t
r
ee" able to
r
ead its ow
n
o
utpu
t
ag
a
i
n
from
.
.
.
commit
|
commitdiff
|
tree
2005-04-12
David Woodhouse
[PATCH] re
v
-tree support
for "
i
n
X
b
u
t not in Y"
.
commit
|
commitdiff
|
tree
2005-04-12
Christopher Li
[PATCH] show-diff
sh
o
w deleted files a
s
diff a
s
well
.
commit
|
commitdiff
|
tree
2005-04-12
Linu
s
Torva
l
ds
Remov
e
th
e
annoyi
n
g
"
ok" prin
t
out fro
m
show-diff
.
commit
|
commitdiff
|
tree
2005-04-12
L
inus
T
orvald
s
A
d
d
a "check-files" command,
w
hich is usefu
l
for
scripti
n
g
commit
|
commitdiff
|
tree
2005-04-12
Linus T
o
r
valds
Add
"show-fil
e
s"
c
om
m
and to sho
w
the list of manage
d
.
.
.
commit
|
commitdiff
|
tree
2005-04-12
Linu
s
Torvalds
Allow zero-sized
f
iles to b
e
checked in
.
commit
|
commitdiff
|
tree
2005-04-12
L
i
nus To
r
va
l
d
s
Make the rev-
t
r
e
e o
u
tput
m
ore regular
.
T
h
is is t
h
e
.
.
.
commit
|
commitdiff
|
tree
2005-04-12
Linus Torvalds
M
a
ke "rev-t
r
ee" capable of showing the difference in
.
.
.
commit
|
commitdiff
|
tree
2005-04-11
Linus Torvalds
Make "rev-tree
"
more efficient and more useful
.
commit
|
commitdiff
|
tree
2005-04-11
Linus Torv
a
l
d
s
Rename "
.
dirca
c
he" dir
e
c
t
o
r
y
to "
.
git"
commit
|
commitdiff
|
tree
2005-04-11
Linus Tor
v
alds
Fi
x
stale index
.
lock fil
e
r
emoval using "atexit()"
.
commit
|
commitdiff
|
tree
2005-04-11
L
inus Torval
d
s
Add a "rev-
t
ree"
helper,
which calculates the re
v
ision
commit
|
commitdiff
|
tree
2005-04-11
Linus
T
orvalds
Fix "usag
e
(
)" to d
o
the mis
s
ing line termination
.
commit
|
commitdiff
|
tree
2005-04-11
Linu
s
Torvalds
Fix "update-cache" no
t
fixing
up the size
f
ield as
.
.
.
commit
|
commitdiff
|
tree
next