repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
hash-object: don't use mmap() for small files
2010-01-21
Junio
C
H
a
m
ano
Merge
branch 'jc
/
c
o
nf
l
i
c
t-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
a
g
/
ma
i
nt-appl
y
-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch
'
ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
ano
Merge bra
n
ch 'nd/status-par
t
ial-refresh
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Me
r
ge
r
emote bran
c
h
'
remot
e
s/trast-d
o
c/for-next'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io
C Hamano
Merge branch 'jh/notes'
(early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
anch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
ma
n
o
Merge branch 'j
c
/maint-refresh-index-is-optio
n
al
-
fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Haman
o
Fix "log" family no
t
to b
e
too
ag
r
essive about
showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch
'
r
r/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
b
ranch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'js/exec-error-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
erge branch 'jc/ls-file
s
-ignored-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'j
c
/grep-l
o
ok
a
head'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Merge branch 'jc/maint-
s
trbuf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge branch 'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge
b
ranch
'
d
a
/di
f
ftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh
/
reba
s
e
-fixup
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Mer
g
e
b
ranch 'ns/r
e
base-
a
uto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'mh/rebase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
branch 'il
/
push-
s
e
t
-up
s
tream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'jk
/
warn-author-
c
ommitter-after
-
commit
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'
j
c/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
aman
o
Merge
branc
h
'tr/http-push-ref
-
status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bk/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'sd/c
d
-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merg
e
branch 'jc/symbol-
s
tatic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
date
.
c: mark f
i
le-local function st
a
ti
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Sync
w
ith 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge br
a
nch
'
b
g/mai
n
t
-
remote
-
update-
d
efault' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Mer
g
e branch 'sb/
m
a
int-octopus' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'bg/maint
-
a
dd-
a
ll-doc'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge bra
n
c
h
'
maint-1
.
6
.
5' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
G
i
t
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge branch 'jk/ma
i
nt
-
1
.
6
.
5-reset-hard' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
n
o
M
erge br
a
nch 'tr/
m
ai
n
t-1
.
6
.
5-bash-pr
o
mp
t
-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge branch 'dp/maint-1
.
6
.
5-fast-import-
n
on
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e
branch 'jm/maint-1
.
6
.
5-grep-NUL-
t
er
m
inate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Tea
c
h @{upstream}
sy
n
tax
t
o st
r
b
uf_branchan
m
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
an
o
t150
6
: m
o
re test
f
o
r
@{upst
r
e
a
m} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fi
x
"checkout A
.
.
.
" s
y
nonym
f
or "ch
e
ckout A
.
.
.
H
E
AD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't req
u
ire the re
p
os
i
tor
y
to
b
e
w
ritabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
branch
'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch 'maint-1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
M
e
rge br
a
nch 'maint-1
.
6
.
3' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
M
erge branch '
m
aint-1
.
6
.
2' into
ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
M
erge co
m
mit 'v1
.
6
.
4
.
4-8-g
8
de65
1
8'
into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Fix mis-
b
ackport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update d
r
aft release notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Merg
e
branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Update
draft r
e
lease notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merg
e
b
r
anch
'
dp/
m
aint-1
.
6
.
5-f
a
st-impor
t
-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bra
n
ch 'jc/rer
e
re'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge
branch 'pc/
u
nint
e
resting-su
b
m
odule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'nd/
i
ncl
u
de-t
e
rmios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
H
amano
Merge bra
n
ch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
H
amano
Merge branch
'jm/
m
ai
n
t-1
.
6
.
5
-gr
e
p-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
s
y
mlinks
.
c: remove unused
fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
a
n
o
ob
j
ec
t
.
c: remov
e
unused functi
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Docume
n
t that m
e
r
g
e st
r
a
tegies can now take
th
e
ir o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
Make "subtree" part more
o
rthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ha
m
ano
pull: Fix
pars
i
ng of
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Ham
a
no
Update draft
release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
ge branch 'tc
/
test-loc
a
t
e-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C Hamano
M
erge b
r
a
nch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Merge bran
c
h 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch 'jc
/
m
aint-1
.
6
.
1
-
checkout-m-cu
s
t
o
m-merg
e
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge br
a
nch
'
tc/clone-v-
p
r
ogress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge br
a
nch 'tc/sm
a
rt-
h
tt
p
-restr
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C
Haman
o
Merge
b
ran
c
h 'jk/run-command-use-she
l
l'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
rge br
a
nch 'sr
/
g
fi-options
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Update COP
Y
I
NG w
i
t
h GPLv2
w
it
h
n
e
w FSF
ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_i
d
ent_sufficiently_given(): refactor
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
n
o
u
s
e
r
_ident_s
u
f
f
icie
n
t
l
y
_
given():
r
e
fact
o
r the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
rerer
e
:
honor conflic
t
-marker-size attr
i
b
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepare fo
r
c
u
s
tomizabl
e
conflict ma
r
ker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
c
ommit
.
c::print_summary: d
o
n
ot release t
h
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Haman
o
conflict-marker-size: new attri
b
ut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rerere:
use ll_
m
e
rg
e
()
i
ns
t
ead of usin
g
x
d
l_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
merge-tree
:
use ll_me
r
g
e
(
) no
t
x
dl_
m
erg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
xdl_merge(): allow passing do
w
n marker_
s
i
z
e
in
xm
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): i
n
troduc
e
xmpar
a
m_
t
for merge sp
e
ci
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
a
m
ano
g
i
t_at
t
r(): fi
x
function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merg
e
branch
'
c
c/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Teach diff that modified submodule directo
r
y is
d
irty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
Hama
n
o
g
r
ep -
-
n
o
-index: allow use of "git grep" outside
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C Hamano
gr
e
p: pr
e
pare to run
outside of a w
o
rk tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/checkou
t
-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merge branch 'rs
/
maint-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge b
r
anch 'il/
v
cs-h
e
lper'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C
H
amano
strbuf_addbu
f
():
allow passin
g
the same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Ha
m
a
no
Merge branch 'c
c
/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
n
o
Me
r
ge
branch '
n
d/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Ha
m
a
n
o
t7502: test
co
m
mit
.
s
tat
u
s,
--status and --no-stat
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
gr
e
p: ri
p
out
pessimization to use fi
x
m
atch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Ha
m
a
n
o
gre
p
:
rip out support
f
or external grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
Hamano
Merg
e
branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Ham
a
no
strbuf
.
c:
remove un
u
sed functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next