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/conflict-marker-size' into next
2010-01-19
Junio
C
Hamano
M
e
rge
branch 'jc/conflict-marker-size' into next
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
H
a
mano
Merge branch 'i
l
/remote
-
updates'
i
nto next
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge b
r
anch 'il/branch-set-upstr
e
a
m
' into n
e
x
t
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge bra
n
ch
'i
l
/rev-names
p
ace
'
into next
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'ag/
m
a
i
n
t-apply-too-large-
p
'
i
nto next
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
a
nch 'ap/merge-backend-opts' into next
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
nch 'jc
/
symbol-stat
i
c' into
n
ext
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Me
r
g
e
b
ranch 'master' int
o
next
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Update draft release
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Haman
o
Merg
e
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Upd
a
te d
r
aft
rele
a
se no
t
es to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'dp/m
a
int-1
.
6
.
5
-fast
-
import-
n
on-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranc
h
'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'
pc/un
i
nteresting-submodule-disa
p
p
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'nd
/
include-termios-fo
r
-
osol'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ha
m
an
o
M
e
rg
e
bran
c
h 'j
s
/wi
n
do
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'jm/maint-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
M
e
rge bra
n
ch 'jc/symbol-static' (early p
a
rt)
into ne
x
t
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C
Hamano
sy
m
links
.
c
:
remove
u
nused func
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
object
.
c: remove unused
f
u
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge re
m
ote b
r
anch 'remotes/trast-doc/for-ne
x
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that
merg
e
strategies can now
t
a
k
e the
i
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtree" part mor
e
or
t
hogonal
t
o
t
he rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
pull: Fi
x
parsing of -
X
<
o
pt
i
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
rge branch 'm
a
ster' in
t
o next
commit
|
commitdiff
|
tree
2010-01-18
J
uni
o
C Ha
m
ano
U
p
date draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C
H
am
a
no
Merge branc
h
'
t
c/t
e
st-locate-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Merge bra
n
ch
'jh
/
commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Mer
g
e bran
c
h '
j
n
/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
M
er
g
e bran
c
h 'jc/maint-1
.
6
.
1-c
h
eckout-m-
c
usto
m
-merge
'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Me
r
g
e
b
ranch 't
c
/clon
e
-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/sma
r
t-ht
t
p-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
Merge branch 'j
k
/r
u
n-comm
a
nd-use-sh
e
l
l
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
M
erge branch
'
sr/
g
fi-options'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Ha
m
ano
Merge branch
'jl/s
u
b
mo
d
ule-diff' into
n
e
xt
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
Merge branc
h
'jc/gr
e
p-lookah
e
ad' into
n
ext
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merg
e
branch
'
jk/warn-author-committer-after-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
j
c
/ident' into
next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Upd
a
te C
O
PYING with
GP
L
v2 with ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C
H
amano
us
e
r
_
ident_sufficient
l
y
_
give
n
():
re
f
actor the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
user_ident_s
u
ff
i
ciently_give
n
():
refactor t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rerere: honor confli
c
t-marker
-
size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Haman
o
rerere:
p
r
epare for cu
s
tomiza
b
le conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
M
e
rge branch
'
jk/warn-author-co
m
mitter-after-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
commit
.
c:
:
print_summary
:
do not rel
e
a
se the
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Ha
m
ano
conflict-ma
r
ker-size: n
e
w at
t
rib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C
Hamano
re
r
ere
:
use ll_m
e
rge(
)
in
s
tead of using xdl_merge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
me
r
ge
-
tree: use ll_merg
e
(
)
not xdl_m
e
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
dl_merge(): all
o
w pass
i
ng down
m
a
r
ker_size in xmpara
m
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introdu
c
e
x
mpar
a
m_t for merge speci
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
gi
t
_
attr(): f
i
x function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C Hamano
Merge branch 'nd/sta
t
us-par
t
ial-
r
e
f
resh' (early part
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
Me
r
ge branch 'rr
/
core-tutori
a
l' i
n
to
n
ext
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
Mer
g
e branch '
i
l
/
push-set-upstr
e
am' into
n
ext
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ha
m
ano
M
erge branch 'nd/incl
u
de-t
e
rmios-
f
o
r
-osol'
i
nto next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'
pc/uninteresting-submodu
l
e-di
s
appear
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
a
n
o
Merge branch 'sd/cd-p-
s
h
ow-topl
e
vel' i
n
to n
e
xt
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
Merge branch 'jk/warn-author-committ
e
r-aft
e
r
-
c
o
mmi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Haman
o
M
erge branch
'
jl/submod
u
le-diff' into
next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge
b
ran
c
h
'
m
m/conflict-a
d
v
ice' i
n
to next
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge b
r
anch 'jc/m
a
int-strbuf
-
add-fix-doub
l
i
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
m
a
no
M
erge branc
h
'bk
/
fi
x
-relative-gi
t
d
ir-file' int
o
next
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Ham
a
no
Merge
b
ranch 'j
c
/l
s
-files-ignor
e
d-pathspec' into
n
e
xt
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'js/exec-error-repor
t
' into next
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
Merge branch 'tr/http
-
push-r
e
f-st
a
tus' into next
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
Merg
e
b
ranch
'
dp/maint-1
.
6
.
5-fast-import
-
n
on-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'mh/r
e
base-fixup' into next
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge
branch '
t
c/smart-http-restrict' into next
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
ma
n
o
Me
r
ge branch
'
d
a/di
f
f
t
o
ol' into n
e
x
t
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
M
e
r
g
e
b
ran
c
h 'master
'
i
n
t
o next
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch
'cc/re
s
et
-
more'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
T
each
d
iff tha
t
modified
s
ub
m
odule
d
irectory is
d
irt
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-
i
ndex: allo
w
use of "
g
it grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep:
prepare
to run
o
u
tside of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
ni
o
C Hamano
Merge
b
ran
c
h
'
jc/grep-lookahea
d
' into next
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Mer
g
e bra
n
ch 'jc/fix-t
r
ee-walk' into nex
t
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erge br
a
nch 'jc/cach
e
-unmer
g
e
'
into
n
ext
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jh/comm
i
t-status'
i
nto
n
e
xt
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Me
r
ge br
a
nch 'master
'
into nex
t
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge
b
r
anch
'
j
c
/c
h
eckout-m
e
rge-base'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hama
n
o
Merge bra
n
c
h 'rs/maint-
a
rchive-match-
p
a
thspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e bra
n
ch 'il/v
c
s
-
helper
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addb
u
f(): all
o
w p
a
ssing the same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C
H
amano
Me
r
ge
branch 'cc/reset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
Me
r
ge branch 'nd/spars
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
t7502: test commit
.
sta
t
us, --stat
u
s and -
-
n
o
-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: ri
p
out pes
s
i
mization
t
o
use fixm
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Ham
a
no
g
rep: rip
o
ut s
u
pport fo
r
extern
a
l gre
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C
Hamano
Merge branch 'mh/rebase-
f
ixup
'
i
n
to nex
t
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
Me
r
g
e
branch
'ma
s
ter'
i
n
t
o
next
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
amano
Merge
br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
utf8
.
c
: mark file
-
local functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
s
t
rbuf
.
c:
r
e
move
u
nused fun
c
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
s
h
a1_f
i
le
.
c:
remo
v
e unu
s
ed functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C
Hamano
ma
i
l
m
ap
.
c: remo
v
e unuse
d
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hamano
submo
d
ule
.
c: mark fil
e
-local
f
unction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
quote
.
c: mark
file-local function stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
a
mano
remote-curl
.
c: mar
k
file-l
o
cal function stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
read-cach
e
.
c: m
a
rk
f
i
le-l
o
c
a
l
fu
n
ctions sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next