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
Make test case numbers unique
2010-01-21
Johannes Sixt
Make test case numbers unique
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
c
o
nflic
t
-marker-size: add test
a
nd
d
o
c
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hama
n
o
Up
d
ate draf
t
relea
s
e note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ha
m
ano
M
erge branc
h
'bw/cvs
i
mpo
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
anch
'
jc
/
c
heckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Me
r
ge branch 'ag/p
a
tch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Haman
o
M
e
rge branch 'j
c
/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h
'
a
g
/
maint-appl
y
-too-large
-
p'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C
Ham
a
no
Merge b
r
an
c
h 'a
p
/
m
erge
-
backe
n
d-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch
'nd/status-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
H
a
m
an
o
Merge remote branc
h
'remo
t
es/tras
t
-d
o
c
/
f
o
r
-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erg
e
b
r
anc
h
'jh/notes
'
(early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
M
e
rge branch '
j
c/ma
i
nt-refr
e
sh
-
i
n
dex-is-option
a
l-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ranch 'rr/co
r
e-tuto
r
i
a
l'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge b
r
anch 'jc/c
a
c
he-unme
r
ge'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'js/exec-e
r
ror-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
r
ge branch 'jc/ls-fil
e
s-ignored-pathspe
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
er
g
e branch
'
j
c/g
r
ep-lo
o
k
a
h
e
ad'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Merge b
r
anch 'jc/maint-strb
u
f-add-fix-d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge bra
n
ch 'mm/conflict-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
g
e
b
r
anch
'da/di
f
ftool
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Me
r
ge branc
h
'mh/rebase-
f
i
xup'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge branch 'n
s
/reba
s
e-auto
-
s
q
u
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
r
g
e branch 'mh/r
e
base-f
i
xup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge
branch 'il/pu
s
h-set-up
s
tre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
m
ano
Merge
b
ranch 'jk/
w
arn-auth
o
r-commi
t
t
e
r-
a
ft
e
r-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
b
r
a
n
c
h 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge b
r
anch '
t
r/ht
t
p-
p
us
h
-re
f
-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'bk/fix
-
rel
a
tive-gitd
i
r-fi
l
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-
s
ho
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merg
e
b
r
a
nc
h
'jc/symbol-s
t
at
i
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
date
.
c: ma
r
k file-
l
o
c
al function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Sy
n
c
with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
G
it 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
e
r
ge branch 'bg/maint-remote-u
p
d
ate-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
s
b/maint-octopus' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Mer
g
e branch
'
bg/maint-add-al
l
-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merg
e
branc
h
'maint-1
.
6
.
5' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hama
n
o
G
i
t 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
Mer
g
e b
r
anch 'jk
/
m
aint-1
.
6
.
5-r
e
set-hard'
i
nto mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ra
n
ch
'tr/maint-1
.
6
.
5-bash-prompt-show-
s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Mer
g
e branch 'dp/mai
n
t-1
.
6
.
5-fast-
i
mport-no
n
-
c
omm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
bra
n
ch 'jm/maint-1
.
6
.
5-grep-NUL-
t
erm
i
nate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "che
c
ko
u
t A
.
.
.
" syno
n
ym for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
st
a
tu
s
:
don't r
e
quire
the
reposit
o
r
y to
b
e wri
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C H
a
mano
Me
r
ge
br
a
n
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Make
f
ile: honor
N
O_CURL
w
hen setti
n
g R
E
MO
T
E_
C
U
RL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmig
a
n
Casebolt
ident
.
c: replace fp
r
intf with fput
s
to suppress compile
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái N
g
ọ
c Du
y
rm
:
only refresh entries
that we may
touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David
R
ipto
n
bisect: fix
s
in
g
ular/plural grammar ni
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n Walto
n
cvsimport:
sta
n
dari
z
e system() c
a
lls
to external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
c
vsimpor
t
:
standarize ope
n
() c
a
lls to ext
e
rnal git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimp
o
rt: modernize callo
u
ts to git subcommands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
H
amano
Mer
g
e branch
'
maint-1
.
6
.
4
'
int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
e
rge bra
n
c
h
'maint-1
.
6
.
3' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Merge br
a
n
ch 'maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge commi
t
'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ham
a
n
o
Fi
x
mis-back
p
ort o
f
t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Update draft rele
a
se n
o
tes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ham
a
no
Update draft
release notes t
o
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
dp/mai
n
t-1
.
6
.
5-fast-import
-
n
o
n-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge bra
n
ch
'
jc/
r
erere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge
b
ranch 'p
c
/
u
n
interesting
-
submod
u
l
e
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Mer
g
e branch '
n
d/include
-
termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branc
h
'
j
s
/wind
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Grue
n
bacher
b
uiltin-apply
.
c: fix
t
h
e
--- an
d
+++ header filena
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel
Barkal
o
w
Re
p
lace parse_blob
(
) with an expla
n
at
o
r
y
c
o
mment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
Merge bra
n
ch
'
jm/maint-1
.
6
.
5-gre
p
-
N
UL-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
i
m Meyer
i
ng
grep: NUL t
e
rminat
e
i
nput
from
a
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andrea
s
Gruen
b
ac
h
er
bu
i
l
t
in
-
app
l
y
.
c: Sk
i
p filenames wi
t
hout enoug
h
co
m
ponents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
symlinks
.
c: rem
o
ve unused
fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
object
.
c: remove unused func
t
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
Doc
u
m
ent tha
t
merge
st
r
ategies can now take
their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Extend merge-subtree tests to
t
est -Xsubtr
e
e=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C H
a
mano
Mak
e
"subt
r
e
e
" par
t
more or
t
hogonal to the re
s
t of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix parsin
g
of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach git
-
pull
t
o pa
s
s -X<o
p
tion> to
g
i
t-mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
ve
r
y Pennarun
g
it mer
g
e
-X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update
draft re
l
ease notes
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Merge
b
ranch 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C
Hama
n
o
Merge bran
c
h 'jh
/
c
ommit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge branc
h
'jc/maint-1
.
6
.
1
-che
c
kout-
m
-custom-
m
erge'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Haman
o
Merge branch '
t
c/clo
n
e-v-pro
g
ress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
m
an
o
Merge branch
'tc/s
m
art-http-restr
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C
H
amano
Me
r
ge
b
ran
c
h 'jk/run-co
m
mand-us
e
-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hama
n
o
Merge bran
c
h '
s
r/gf
i
-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
ama
n
o
Update COPYING w
i
th
GPLv2 with new FSF addr
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
u
s
e
r
_id
e
n
t_suffi
c
iently_given(
)
: refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
user_ident_su
f
fi
c
i
e
ntly_given(): refactor the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
rerere: hon
o
r conflict-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rerere: pre
p
are for custo
m
izable
conflict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
c
o
m
m
it
.
c
:
:print_summary
:
d
o
not release the fo
r
mat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
con
f
lict-marker-size
:
new at
t
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
a
no
rerere: use ll
_
merge() i
n
s
t
ea
d
of using
x
dl_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
merg
e
-tree: use ll_
m
er
g
e() not x
d
l_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
aman
o
xdl_merg
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_
m
erge(): introduce x
m
p
aram_t for
m
erge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next