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
Merge branch 'jc/fetch-param' into maint
2010-01-20
Junio
C
Hamano
Merge branch 'dp/maint-1
.
6
.
5-f
a
st-import-
n
on-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
g
e
b
r
an
c
h 'j
m
/maint-1
.
6
.
5-gr
e
p-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Teach @
{
u
pst
r
ea
m
} syntax to strbuf_branchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
t1506
:
more
t
est for @{upstream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Fix "checkout A
.
.
.
" s
y
n
o
nym for "checkou
t
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
stat
u
s
:
don't require t
h
e repos
i
tory to be writ
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'ma
i
n
t-1
.
6
.
4' into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Merge b
r
anch 'm
a
int-1
.
6
.
3' int
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'm
a
i
nt
-
1
.
6
.
2
' into m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Me
r
ge com
m
it
'v1
.
6
.
4
.
4-8-g8de6518' int
o
ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-backport
o
f
t70
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Update draf
t
relea
s
e notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Updat
e
draft relea
s
e
notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Me
r
ge b
r
anc
h
'dp
/
maint-1
.
6
.
5-fast-impo
r
t-no
n
-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge
b
ranch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
ano
Mer
g
e branch 'pc/unin
t
e
r
estin
g
-submod
u
le-dis
a
ppear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Merge branch 'nd/include-
t
ermi
o
s-for-oso
l
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch 'js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Haman
o
M
e
rge
b
r
anc
h
'jm/maint-1
.
6
.
5-g
r
ep-NU
L
-
terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
syml
i
nks
.
c
:
r
e
move unused
f
unct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
o
bject
.
c:
r
e
mov
e
unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
Hamano
Do
c
ument that merge
strategies c
a
n now take their
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Haman
o
M
ake
"subtre
e
" part more orthogona
l
to the
re
s
t of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
p
u
ll
:
Fix p
a
r
sing of
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
ama
n
o
Updat
e
draft re
l
ease n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merge bra
n
ch 'tc/t
e
st-loca
t
e-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge
br
a
nch 'jh/com
m
it-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge branc
h
'j
c
/maint-1
.
6
.
1-checkout-m-custom-me
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
Merge br
a
nch
'
tc
/
clon
e
-v
-
prog
r
ess'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge branch 't
c
/smart-http-r
e
strict'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Hamano
Me
r
ge branch 'jk/run-c
o
mmand-us
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge
branch 'sr/gfi-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Hamano
Update COPYING w
i
th GPLv2
with new
F
SF a
d
dress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_suf
f
i
cientl
y
_given(): r
e
factor
t
he l
o
gi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
Hamano
user
_
ident_suffic
i
ently_given(
)
: refactor the
l
o
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
rerere: honor
c
onflict-marker-
s
iz
e
attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hama
n
o
rerere: prepare f
o
r cus
t
omizable conflict m
a
rker
l
ength
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
commit
.
c::print_summary: do not re
l
ease the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
conflict-marker-size: new
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
rerere: use l
l
_merge() instead of u
s
ing
x
dl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
merge-tree: use ll_me
r
ge() not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(): allow pa
s
s
i
n
g down
m
arker_size
i
n xm
p
aram_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
xdl_merge
(
): introduce xmpar
a
m_t for merge s
p
ec
i
fic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
git_attr(): fix function s
i
gna
t
ur
e
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
H
a
mano
Merge branch 'cc/reset-m
o
re'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
Teach diff that
m
odif
i
ed submodule
direc
t
or
y
is dirty
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 Hamano
grep
--no-
i
ndex: allow use of "git g
r
e
p" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Hamano
g
r
ep: prepar
e
to run
o
utside of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
io C Ha
m
ano
Merge branch 'jc
/
che
c
k
o
ut-
m
erge-
b
ase'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge branc
h
'rs/ma
i
nt-archive
-
mat
c
h-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch '
i
l/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
H
a
mano
strbu
f
_a
d
dbuf():
al
l
ow p
a
s
s
ing the
same
b
uf to
d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Me
r
ge branch 'cc/reset-m
o
re'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
M
e
rge branch 'nd
/
sp
a
rse'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
H
amano
t7502:
t
e
st com
m
it
.
statu
s
,
-
-
status and --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
grep: ri
p
out pessimiza
t
i
on t
o
us
e
fixmatch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
m
a
n
o
grep: rip out support f
o
r ext
e
rnal grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o
C
Ha
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Ham
a
no
strbu
f
.
c: remo
v
e unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
am
a
no
sha1_file
.
c: remove unused
functio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
ma
i
lmap
.
c: remove unused fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
utf8
.
c: mar
k
file-
l
ocal function
sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
m
ano
submod
u
le
.
c: m
a
rk file-lo
c
al function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
i
o
C
Hamano
quote
.
c: mark file-loca
l
fu
n
ct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Ha
m
ano
remote-curl
.
c: mark fil
e
-l
o
ca
l
f
unction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Haman
o
r
e
ad-cache
.
c: mark file-local func
t
ions stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Haman
o
parse-options
.
c: mark file-loca
l
function stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Ham
a
no
entry
.
c: mark file-loca
l
function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C H
a
mano
http
.
c:
m
ark file-loca
l
functions sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
M
e
rge
bran
c
h
'jc/m
a
int-1
.
6
.
4-
g
rep-lookahead'
i
nto jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
gre
p
: o
p
t
imiz
e
b
uilt-in grep by skipping l
i
nes
t
hat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
amano
g
rep: -L
s
hould show
e
mpty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
man
o
p
r
et
t
y
.
c
:
mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C H
a
mano
buil
t
in
-
rev-
l
is
t
.
c
: mark file-loc
a
l func
t
i
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Haman
o
bisect
.
c
:
mark f
i
le-
l
ocal functi
o
n stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ha
m
ano
rerere forget path: for
g
et record
e
d res
o
lution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C
Hamano
rer
e
re: refactor rerere logic t
o
m
ake it i
n
depe
n
dent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
ident
.
c
: treat $EM
A
IL as
givi
n
g
user
.
e
mail iden
t
ity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
ident
.
c
:
check explicit ide
n
tity for name a
n
d
email
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch
'
tr/http-updates'
commit
|
commitdiff
|
tree
2010-01-10
J
unio
C
Hamano
Merge branch 'jk/maint
-
1
.
6
.
5
-
reset-h
a
rd
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
amano
Merge branch
'
jk/pus
h
-to-d
e
lete'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Ha
m
an
o
Merge br
a
n
ch 'mm/c
o
n
fig-path'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C H
a
mano
Merge
bran
c
h '
p
m/c
v
s-environ'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
aman
o
M
erge branch 'tr/
m
ai
n
t-1
.
6
.
5
-
bash-prompt
-
show-
s
u
bmod
u
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Ham
a
no
Mer
g
e branch '
b
g/maint-remote-upd
a
te-default'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Me
r
ge branch 'mm/diag-pat
h
-in-tre
e
i
s
h
'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C
Hamano
Merge branch
'fc
/
opt-quiet-gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
M
e
r
ge branch
'
maint
'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merge branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio
C
Hamano
Merge branch
'
maint-1
.
6
.
1' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
M
e
rg
e
bra
n
c
h
'
maint-1
.
6
.
0
' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
ls-files: fix overeager pathsp
e
c optimization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
J
unio C
H
amano
r
ead_directory(): further split treat_p
a
th()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
read_direc
t
ory_recurs
i
ve()
:
refactor
h
andl
i
ng of a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Hamano
t3001:
t
est l
s
-
files -o i
g
nored/dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next