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 git://git.bogomips.org/git-svn
2010-01-17
J
u
n
i
o C Ha
m
ano
re
r
e
r
e
: use ll_merge() instead of
u
sing
x
dl_me
r
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
me
r
ge-tree
:
us
e
ll_mer
g
e
(
) not xdl_me
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_mer
g
e
(
):
allow passin
g
down ma
r
ker_size in
x
mpar
a
m_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(): introduce
xmparam_t
f
or merg
e
spec
i
fic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
git_attr
(
)
:
fi
x
func
t
ion sign
a
tu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branc
h
'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Teach diff that
modified submodule
directory 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
Jun
i
o C H
a
mano
grep -
-
n
o
-index: allow use of "git gre
p
"
o
u
t
side
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
g
r
ep:
p
repa
r
e to
run outsid
e
of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
b
ranch 'jc/checkout-merge
-
b
a
se'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
Merge branch 'rs
/
maint-arc
h
ive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'il
/
vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
strbuf
_
addbu
f
(): allow passing the sa
m
e bu
f
to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'c
c
/
r
e
set-mor
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t750
2
:
t
est commit
.
status,
--status and
-
-no-sta
t
us
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
grep: rip out p
e
ss
i
m
i
zat
i
on to use fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
grep: rip out su
p
port
for external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strbuf
.
c:
r
emov
e
unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
m
a
n
o
sha1_fil
e
.
c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
mai
l
ma
p
.
c: re
m
o
ve
unused fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
utf8
.
c: mark file
-
loc
a
l
fu
n
c
t
ion sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
subm
o
dule
.
c: mark file-local function
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
quote
.
c: mark file-local funct
i
on
s
ta
t
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hama
n
o
r
e
mote-curl
.
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 Hamano
read-cach
e
.
c: mark
file-local functions
s
tati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
parse-options
.
c: ma
r
k file-local f
u
nction stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
i
o
C Hamano
entry
.
c: mar
k
file-local f
u
n
ction
s
t
atic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
http
.
c:
mark file-local functi
o
ns
st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge bra
n
ch 'jc/maint-1
.
6
.
4-gre
p
-lookahead' into jc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C
H
a
man
o
gr
e
p: optimize
bu
i
lt-i
n
grep by skip
p
i
ng l
i
nes that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
io C Hamano
gr
e
p:
-L should show empty
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Haman
o
pretty
.
c
:
m
a
rk file-loca
l
fun
c
tion st
a
ti
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
b
uiltin-
r
e
v
-
l
ist
.
c: mar
k
file-local f
u
n
c
tion static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C
H
amano
bisect
.
c: mark f
i
le-
l
oca
l
functio
n
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
J
u
n
io C
H
amano
rerere forget path: for
g
et recorded
res
o
lut
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C Hamano
rerer
e
: refacto
r
rerere lo
g
i
c to make
i
t in
d
ependent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
ide
n
t
.
c
:
treat $EMAIL as giving user
.
emai
l
identity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
ident
.
c: check explicit identity
fo
r
n
a
me and email
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Ham
a
n
o
Merge branch
'
tr/h
t
t
p-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Ha
m
a
n
o
Merge branch
'
jk/
m
aint-1
.
6
.
5-reset-hard'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C H
a
ma
n
o
Merge branch 'jk/push-to-
d
e
l
ete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
m
ano
Merge b
r
anch 'mm/config-
p
ath
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
M
e
r
ge bran
c
h 'pm/cvs-environ'
commit
|
commitdiff
|
tree
2010-01-10
J
u
ni
o
C Ha
m
ano
Merge branch 'tr/mai
n
t-1
.
6
.
5-bash-promp
t
-sho
w
-
s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
io C Hamano
Me
r
ge branc
h
'bg/maint-remote
-
update-default'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
Merge br
a
n
ch 'mm/di
a
g
-path
-
i
n
-treeish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
nch '
f
c/opt-qui
e
t-gc-rese
t
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
man
o
M
er
g
e branch 'maint-1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C
Hamano
Merge
b
r
anch 'maint-1
.
6
.
1' i
n
to maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
Merge branch 'maint-1
.
6
.
0' i
n
to
mai
n
t
-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio C H
a
m
a
no
ls-file
s
: fix
overeager
p
at
h
spec
o
ptim
i
zation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Juni
o
C Hamano
r
ead_directory():
f
urther sp
l
it
t
r
e
at_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Hamano
read_direct
o
ry_recursive(): refactor handli
n
g
of a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
J
unio C Hama
n
o
t3001: test ls-files -o ignored/dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-08
Junio C Hamano
id
e
n
t
.
c: r
e
move unused variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Hamano
Des
c
ribe sec
o
n
d
batch
f
or 1
.
7
.
0 in draft r
e
lease notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Hamano
Merge branch 'js/filte
r
-br
a
n
c
h-
p
r
ime'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merg
e
b
r
a
n
c
h 'sb/maint
-
octopus'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Ha
m
ano
Merge branch 'mg/tag-d-sh
o
w'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C
Hamano
Merg
e
branch 'so/cvsserver
-
update'
commit
|
commitdiff
|
tree
2010-01-07
J
u
n
i
o
C Haman
o
Merge branch '
b
g/
m
a
i
nt-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merg
e
branch 'm
v
/commit-d
a
te'
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C Hamano
Me
r
ge branch 'mo
/
b
i
n-wrap
p
ers'
commit
|
commitdiff
|
tree
2010-01-07
J
unio
C
Hamano
chec
k
out
-
m: do
not try to fall back to --merge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Ju
n
io C Hamano
checkout -
m
path: fix re
c
reating co
n
flict
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
.
g
itattributes: detect 8-sp
a
ce i
n
dent
in
s
hell sc
r
ipts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ham
a
no
F
ix
b
it assi
g
nment for CE_CONF
L
IC
T
ED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Jun
i
o C Hama
n
o
"reset --me
r
ge":
f
ix unm
e
rged c
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Junio C
H
amano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-31
Juni
o
C Hamano
M
e
rge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-31
Jun
i
o
C H
a
mano
Merge branch 'ma
i
nt-1
.
6
.
0
'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-30
J
unio
C Hama
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-30
Junio
C
Ham
a
no
branch
-d: base the "alread
y
-merged
"
safety on
t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
M
er
g
e
branch 'maint-1
.
6
.
1' in
t
o maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C
H
amano
M
e
rge branch 'main
t
-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
J
unio
C
Hamano
R
emove http
.
a
uthAny
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-28
J
un
i
o C Haman
o
Merge branch 'jk/
1
.
7
.
0
-
stat
u
s'
commit
|
commitdiff
|
tree
2009-12-28
J
u
nio C H
a
mano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-27
Junio C Hamano
Merge
branch 'nf/ma
i
n
t-fi
x
-index-ext-le
n
-
on-be64' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
M
e
rge bran
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C
Hamano
Mak
e
file: Free
B
SD (b
o
th 7 a
n
d
8)
needs OL
D
_ICONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
Start 1
.
6
.
6
.
X
maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
Mer
g
e b
r
anch 'jc/main
t
-obsd46' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
K
ick off 1
.
7
.
0 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
n
o
Merge branch
'
g
b/
1
.
7
.
0-diff-whitespace-only-o
u
tpu
t
'
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C
Hama
n
o
Merge
b
r
anch 'jc/1
.
7
.
0
-diff-whitespace-only-status'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
Merg
e
branc
h
'
j
c/1
.
7
.
0-pus
h
-safety
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
Merge b
r
anch 'jc/1
.
7
.
0-send-email-no-thread-default'
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
M
e
rge branch '
s
r/vcs-helpe
r
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t401
9
"grep" portabil
i
ty f
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hama
n
o
t120
0
: work around a bug in
some implementations
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C Hama
n
o
rerere: r
e
move silly 1024-byt
e
li
n
e limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
reso
l
ve-un
d
o
: teach
"upd
a
te-index --unr
e
solve" to use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: "checkout
-
m
path"
u
ses reso
l
ve-undo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
e
solv
e
-
u
n
d
o: allo
w
plu
m
bing to
c
l
ear the
information
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
esolve-
u
ndo: ba
s
ic t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next