repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-24
Junio
C
Hama
n
o
rev-list --bisec
t
:
F
ix "halfway"
optimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merg
e
branch
'
m
a
ster' into jc/bi
s
ect
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-03-24
Chr
i
stian Coud
e
r
D
o
cumentation: b
i
se
c
t: make a comment fit better
in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
C
hristian Coude
r
Do
c
umentation: bisect: add s
o
me
t
itles to some para
g
raphs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Christian Couder
Documenta
t
ion: bis
e
ct: reformat more parag
r
a
p
hs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
C
hristian Couder
Documenta
t
ion
:
bisect: reword o
n
e paragraph
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Christ
i
an Couder
Documentat
i
o
n: bi
s
ect: reformat some
para
g
raphs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Hamano
Fix path-limit
e
d "r
e
v
-
list -
-
bisect" te
r
mination condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jaku
b
Na
r
e
b
ski
gitw
e
b: Fix "next" link
in co
m
mit view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Ha
m
ano
git-bisect
.
s
h
:
p
roperly
d
q
$
GI
T
_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t-bise
c
t: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Ham
a
no
checkout: rep
o
rt wh
e
re the new HEAD is upon de
t
a
ching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Haman
o
t6004:
add a bit
m
o
re pa
t
h
optimization test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Christian C
o
uder
Bis
e
c
t
:
i
mple
m
ent "git b
i
sect
run <
c
md>
.
.
.
"
t
o
automati
c
ally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Uwe Kle
i
ne-König
B
is
e
ct: con
v
ert revs give
n
t
o
good and bad to commits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Johannes Schi
n
delin
t
4118: be nice to non-
G
NU
se
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-
a
ppl
y
: Do not free the w
r
ong buffer when we conver
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Ha
m
ano
Merge git
:
//gi
t
2
.
kernel
.
org/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ham
a
no
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-22
Peter Eriksen
Documentat
i
on/pack-
f
o
r
mat
.
txt: C
l
ear up description
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Nicolas Pitre
update HEAD ref
l
og whe
n
b
ran
c
h pointed
to b
y
HEAD is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
An
d
y Parkins
upda
t
e-hook: ab
o
rt
e
arly if th
e
proj
e
c
t d
e
scr
i
ption
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Michael
S
.
Tsirkin
git
-
m
erge:
Put FE
T
CH_HEA
D
data in merge com
m
it
message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-rebase: make 're
b
ase HEAD branch' wor
k
a
s expe
c
t
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
i
o C H
a
mano
git-rev-list --bi
s
ect: op
t
imiza
t
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C
H
a
mano
g
it-rev
-
lis
t
: add --bisect-vars option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hamano
t
6
002: minor spelling fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
tr
e
e_ent
r
y_inter
e
sting(): al
l
ow it to say "ev
e
ryt
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Ha
m
ano
t
r
ee-diff: avo
i
d strncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Hamano
Teach tr
e
e_entr
y
_inte
r
esting()
that the tree entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus
T
orvalds
Switc
h
over tree
d
escr
i
ptors to
c
o
ntain a pre-parsed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus
Torvalds
I
n
iti
a
lize tree descriptors with a help
e
r function
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
L
inus Torval
d
s
Rem
o
ve "pathlen" from "stru
c
t name_entry"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Michael S
.
Tsirkin
f
i
x typo in git
-
a
m
manpage
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C
H
a
ma
n
o
blame: cmp_suspect
i
s not "cmp"
a
nymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas
P
it
r
e
m
inor git
-
pr
u
ne optimi
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
N
i
cola
s
Pitre
improve
c
h
e
c
kout messa
g
e when
asking for same br
a
nch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Linus To
r
valds
Be more care
f
ul about
z
lib r
e
t
ur
n
values
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
L
i
nus Torvalds
Don
'
t ev
e
r
retu
r
n corrupt obj
e
cts fr
o
m
"
parse_object()"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nico
l
as Pitr
e
index-pack: more val
i
dati
o
n checks and cleanups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicolas Pitre
i
nd
e
x-pack: us
e
hash
_
sha1
_
fi
l
e()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Nicol
a
s Pitre
don
'
t ever allo
w
S
HA1 co
l
lisi
o
ns to exi
s
t by
f
etc
h
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Si
x
t
Tea
c
h gi
t
-remote to list pu
s
hed branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Santi Béja
r
g
i
t
-
fetch: Fix sin
g
le_force
in
a
ppend_fetch_head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Juni
o
C H
a
mano
Merge
g
it:
/
/git2
.
kernel
.
org/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-20
C
h
ri
s
Wright
make git clon
e
-
q suppr
e
ss the noise w
i
th http fetch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Linus Torval
d
s
Fix loose objec
t
un
c
o
m
p
ressio
n
c
heck
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Shawn O
.
Pear
c
e
contrib/
c
o
n
ti
n
u
o
us: a continu
o
us
i
ntegration
build
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
J
ohannes Schindel
i
n
P
r
ovide
s
om
e
te
c
hnical
d
oc
u
mentation for shallow clon
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
J
oha
n
nes Schindelin
Add a HOWTO for set
t
ing up
a
stan
d
alone git dae
m
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Johannes Schi
n
delin
xdiff/xutils
.
c(xdl
_
hash_reco
r
d):
factor out
w
hitespace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Junio C Hamano
blame: micro-optimize cmp_suspec
t
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
James Bowes
Repla
c
e
rema
i
ning i
n
stance
s
of s
t
r
d
up with x
s
trdup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Ni
c
olas
P
itre
u
s
e
a
L
RU ev
i
cti
o
n
p
olicy for t
h
e de
l
ta b
a
se cach
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Nicolas Pitre
clean u
p
the delta ba
s
e c
a
che si
z
e
a bit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C H
a
mano
GIT 1
.
5
.
1-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
J
u
nio
C
Hamano
Fix mer
g
e
-
index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Linus To
r
valds
Set up for better
t
r
e
e
d
iff o
p
ti
m
i
z
ations
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Linus Torvalds
Trivial cl
e
anup of
track_tree_refs()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Alexand
r
e Julliard
git
.
el:
Add s
u
pport for commit hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Juni
o
C
H
aman
o
Me
r
ge branc
h
'jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Haman
o
Merge br
a
nc
h
'
f
l/cv
s
s
e
rver
'
commit
|
commitdiff
|
tree
2007-03-19
Sha
w
n O
.
Pearc
e
Limit
the
size of
the new delta_
b
ase_cache
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
J
unio C Hama
n
o
Merge br
a
nch 'sp/run
-
com
m
an
d
'
commit
|
commitdiff
|
tree
2007-03-19
J
.
Bru
c
e
F
ields
Make git-sen
d
-email aware of Cc: line
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Jun
i
o C Ham
a
no
Update main gi
t
.
html
p
age
t
o po
i
nt at
1
.
5
.
0
.
5
d
oc
u
m
e
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Junio
C
Ham
a
no
Merg
e
branch '
a
r/diff'
commit
|
commitdiff
|
tree
2007-03-18
L
i
nus Torvalds
Avoid unnec
e
ss
a
ry strlen() calls
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Nicolas P
i
tre
Reuse ca
c
he
d
data
out of
delt
a
base
c
ache
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Linus Torvald
s
Im
p
lement a simple d
e
l
t
a
_
base c
a
che
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Linus Torvalds
M
a
ke trivial wrapper fu
n
ctions around delta base generation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
J
u
nio C Hama
n
o
Merge 1
.
5
.
0
.
5 in from 'main
t
'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
GIT 1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
James Bowes
M
ake gc a builtin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Junio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-17
Nicolas
Pitre
[PATCH] c
l
ean up pack i
n
d
ex
h
andling a bi
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Nicolas
P
itr
e
[PATC
H
]
add test
f
or OFS_DELTA obj
e
cts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
N
icolas
Pitr
e
[PA
T
CH]
f
ix t53
0
0
-pack-objec
t
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Nic
o
las Pi
t
re
[
P
ATCH
]
local-fetch
.
c: some
e
r
r
or pri
n
ting cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Junio
C
H
amano
apply
m
box: brown paper bag
f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-16
Santi Béjar
git-merge: finish
wh
e
n
git-read
-
tree fails
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-16
Al
e
x R
i
esen
Add
tests
for --quiet
o
pt
i
on
o
f di
f
f programs
commit
|
commitdiff
|
tree
2007-03-16
Shawn O
.
Pearce
use xst
r
dup please
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-16
Pao
l
o Bonzini
git-fetch, gi
t
-
bra
n
ch: Support
local --
t
rack v
i
a a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C H
a
man
o
git-log --fir
s
t-par
e
nt: show only the fi
r
s
t
parent log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ha
m
a
no
try-to-simplify-c
o
mmi
t
: use
d
iff-tree -
-
quiet machiner
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
revi
s
i
on
.
c: e
x
plain wha
t
tree_differe
n
ce d
o
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C H
a
man
o
Teach --quiet to diff backends
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C
Hamano
d
iff --quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
no
Remove un
u
s
e
d
diffcore_st
d
_no
_
resolve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Alex Riesen
Allow git-diff exi
t
with codes si
m
ilar to diff(
1
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
Merge GIT 1
.
5
.
0
.
4
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hama
n
o
GIT 1
.
5
.
0
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Yann Dirs
o
n
Clari
f
y doc for git-
c
onfig --unset-all
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Hamano
git-checkou
t
:
fix "eval" used
f
or mer
g
e labelling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Andy Parkins
upda
t
e-ho
o
k: fix incorr
e
ct use of g
i
t-describe and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
F
r
an
k
Lichtenh
e
ld
c
vsserver: furthe
r
improve
m
essage
s
on commit
a
nd status
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Fran
k
Lichtenheld
cvs
s
erver: Be more chatty
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio
C
Hamano
Merge branch
'
jc
/
repack'
commit
|
commitdiff
|
tree
next