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
Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob
2010-01-17
Junio C
H
amano
U
p
d
at
e
COPYING with G
P
Lv
2
with
n
ew FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user_ident_sufficiently_given(): re
f
actor the l
o
gic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
mano
user_ident_sufficiently_given(): refacto
r
the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
re
r
ere: honor conf
l
ict-
m
arker
-
siz
e
attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
p
re
p
are for cu
s
tomiz
a
b
l
e con
f
lict marker leng
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
c
omm
i
t
.
c::
p
rint_summary: do not release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
conf
l
ict-marker-size: new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
rere
:
us
e
ll_me
r
ge() instead of using xd
l
_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree: use ll_mer
g
e() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
x
d
l_mer
g
e(): allo
w
passing down ma
r
k
e
r_size 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(): int
r
oduce x
m
para
m
_
t for mer
g
e
specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
no
git_attr(): fix
functi
o
n signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merg
e
branch 'cc/res
e
t-more'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Ha
m
ano
T
e
ach diff
that
modified submodule direc
t
ory is
dirt
y
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 Ha
m
ano
g
r
ep
--no
-
index:
a
llow use o
f
"
git gr
e
p"
outside
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C
H
ama
n
o
grep
:
prepare to run outside of
a
w
o
rk tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C
Hamano
Me
r
ge branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
M
e
r
ge branch 'rs/m
a
int-archive-m
a
tch
-
p
a
t
hs
p
e
c
'
commit
|
commitdiff
|
tree
2010-01-13
J
unio
C
Haman
o
Merge branch 'i
l
/vcs
-
help
e
r'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf
_
addbuf(): allow
p
assing the same
b
uf to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o
C
Hamano
Merge branch 'cc/r
e
s
et-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
M
erg
e
branch
'nd
/
spar
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
t7502: test commit
.
stat
u
s, --status and --
n
o
-
status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
grep: rip
o
ut pessimizat
i
on
t
o
us
e
fix
m
atch(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
grep
:
r
ip ou
t
support
for extern
a
l gr
e
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
s
tr
b
uf
.
c: remove unused
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
sh
a
1_f
i
le
.
c: r
e
move unuse
d
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
m
a
ilmap
.
c: r
e
move
unused f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
aman
o
utf8
.
c: m
a
rk file-local fu
n
c
tion static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
submodule
.
c: mark f
i
le-local fu
n
c
t
ion stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C
H
am
a
no
q
uote
.
c:
m
a
rk file-local function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
remote-curl
.
c: ma
r
k
file-
l
ocal functio
n
s
t
ati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
r
e
ad-cache
.
c: mar
k
file-local functions static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o C Ha
m
a
n
o
p
a
rse-options
.
c: mark file-local
function stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
H
amano
entr
y
.
c
:
mark
f
ile-local
fu
n
ction static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
http
.
c: mark file-local
f
u
n
c
tions
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
M
erge br
a
nch 'jc/maint-1
.
6
.
4-gre
p
-
l
ookah
e
ad' in
t
o jc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Haman
o
grep: optimize bui
l
t
-
in grep by skipping lines that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
grep: -L should
show e
m
pt
y
fil
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
Haman
o
pretty
.
c: mar
k
file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
bu
i
l
t
in-rev-list
.
c: mark f
i
le-local function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
b
i
sect
.
c: mark
f
ile-lo
c
a
l function
st
a
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Juni
o
C Hamano
rerere f
o
rget
pat
h
: forget re
c
orded
re
s
olution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere: refactor rerere lo
g
i
c
t
o make
it inde
p
end
e
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
Hamano
ide
n
t
.
c
:
treat $EMAIL as giving user
.
ema
i
l identity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C
H
amano
i
d
ent
.
c: check ex
p
licit identity
for n
a
m
e
and ema
i
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C
H
a
man
o
Me
r
ge branch
'
tr/
h
t
tp-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'jk/maint-1
.
6
.
5-res
e
t-hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
a
mano
Merge branch 'jk/push-
t
o-
d
elete'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merge branch 'mm/
c
onfi
g
-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
Hamano
Merg
e
bra
n
ch 'pm/cvs-environ'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Hamano
Merge br
a
n
c
h
'
tr/ma
i
nt-1
.
6
.
5
-bash-prompt
-
s
h
ow-
s
ubm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge branch 'bg/m
a
int
-
remote-
u
pdate-default'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'mm/diag-path-in-tre
e
ish'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Ham
a
no
M
erge branch 'fc/opt-quiet
-
gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
io C Hama
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
Mer
g
e bra
n
c
h
'
maint-1
.
6
.
2'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
rge
b
r
anch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o
C
Ha
m
ano
Me
r
ge bra
n
ch 'ma
i
nt
-
1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hama
n
o
l
s-fil
e
s: fix ove
r
eager path
s
pec optimization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio C H
a
m
ano
read_dir
e
c
tory(): f
u
r
ther split
t
reat_
p
at
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hama
n
o
read_directory_recur
s
ive()
:
ref
a
c
tor ha
n
dl
i
ng
of a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Hamano
t3001: test ls-
f
ile
s
-
o
ignor
e
d/dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-08
J
u
nio C H
a
mano
i
dent
.
c: remove un
u
sed variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ham
a
no
Describe
s
econ
d
batch for
1
.
7
.
0
i
n
dr
a
ft relea
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio
C Ham
a
no
Merge branc
h
'js/filter-
b
r
a
nch-pri
m
e'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge bra
n
ch 'sb/maint-oc
t
opus
'
commit
|
commitdiff
|
tree
2010-01-07
Junio C
Hamano
M
erge branch 'mg/
t
ag-d
-
show'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Hamano
Merge branch
'
so/
c
v
s
s
erv
e
r-update'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ha
m
an
o
Merge branch 'b
g
/
maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hama
n
o
Merge br
a
nch '
m
v/
c
om
m
i
t
-date'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ham
a
no
Merge branch 'mo/bin-wrapp
e
rs'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
read-
t
ree --de
b
ug-unp
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Haman
o
unpack-trees
.
c: look
a
he
a
d
in t
h
e index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
unpac
k
-trees
.
c: pr
e
par
e
for l
o
oking ahead in the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Hamano
checkou
t
-m
:
do not t
r
y to fall b
a
ck to --me
r
ge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
u
nio C Hamano
chec
k
out -m p
a
th: fix recreating con
f
licts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
.
gitattri
b
u
t
es
:
dete
c
t 8-sp
a
ce indent in sh
e
ll scrip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Juni
o
C
Hamano
Fix bit assignment for CE
_
CONFL
I
CTED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C
Ham
a
n
o
Agg
r
e
s
siv
e
three-way merge:
f
ix D/F case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ham
a
n
o
traverse_t
r
ees():
ha
n
dle D/
F
conflict case s
a
n
ely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
more D/F co
n
fl
i
ct tes
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
J
un
i
o C Hamano
tests:
mov
e
c
o
nveni
e
nce reg
e
xp to matc
h
obje
c
t nam
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Juni
o
C Hamano
"r
e
set --merge": fix unmerged case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Jun
i
o C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
Merge br
a
nch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
Merge branch 'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
Jun
i
o
C Hamano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2009-12-30
Junio C H
a
mano
branch -d: base the "already-merged" safety
on the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Junio C H
a
ma
n
o
Merge b
r
anch 'maint-1
.
6
.
1' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Me
r
ge branc
h
'mai
n
t-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Junio
C
Ha
m
ano
Remove h
t
tp
.
a
u
thAny
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-28
Junio C
Hamano
Merge bran
c
h
'jk/1
.
7
.
0-stat
u
s'
commit
|
commitdiff
|
tree
2009-12-28
Junio C H
a
ma
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2009-12-27
Junio C Hamano
Merge
branch 'nf/maint-fix-inde
x
-ext-len-on-be64' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
Makefile: FreeBSD (both 7
a
nd
8
) nee
d
s OLD_ICONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C Ham
a
no
Start 1
.
6
.
6
.
X maint
e
nance
t
rack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next