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
M
ake test case
n
umbers unique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
conflict-marker
-
size: add test a
n
d
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C H
a
mano
Update
d
raft release
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch 'bw/cvsimpo
r
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merg
e
branch 'jc/checkout-merg
e
-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C H
a
mano
Merg
e
branch 'ag/patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'j
c
/co
n
flict
-
mar
k
e
r
-
s
ize'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
am
a
no
M
er
g
e branch 'ag/maint-a
p
ply-too-l
a
rge
-
p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
ch
'
a
p/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch 'nd/
s
t
a
tus-p
a
rtia
l
-r
e
fr
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
ma
n
o
Merge remote branch '
r
emotes/t
r
as
t
-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
m
a
no
Merge br
a
n
ch 'jh/notes'
(earl
y
part)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
e
r
g
e
b
r
a
nc
h
'jc/maint-refresh-index-
i
s-o
p
tional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge
b
ranch 'rr/core-tu
t
ori
a
l'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge
branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'js/exe
c
-err
o
r-r
e
port'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge
b
ra
n
ch 'jc/ls-f
i
les-i
g
nored-p
a
thspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
jc/g
r
ep-l
o
ok
a
h
e
a
d
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Mer
g
e branc
h
'
j
c/maint-s
t
rbuf-add
-
fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
e
rge branch 'mm/
c
onflict-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge br
a
n
c
h 'da/
d
if
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
n
o
Merge
b
ran
c
h 'ns/rebase-aut
o
-squash'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge br
a
nc
h
'mh/reba
s
e-fi
x
up' (
e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
g
e branch 'jk/warn-au
t
hor-com
m
itter-
a
fter-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
branch 'jc
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Merge b
r
anch 'tr/htt
p
-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
r
ge branch 'b
k
/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Mer
g
e
br
a
nch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e branc
h
'jc/
s
ymbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
date
.
c:
mark file-
l
o
c
al function
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Sync w
i
th 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
G
it 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Mer
g
e branch
'
bg/maint
-
remo
t
e-upda
t
e-
d
efault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Merge br
a
nc
h
'sb/maint-oc
t
opus' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
erge branch
'bg/ma
i
nt-add-all
-
doc' into
maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Mer
g
e branch 'ma
i
nt-1
.
6
.
5'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge br
a
n
ch 'jk/
m
aint-1
.
6
.
5-reset-hard
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
branch 't
r
/
ma
i
nt-1
.
6
.
5
-
b
as
h
-prompt-sh
o
w-su
b
m
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'
dp/
m
aint-1
.
6
.
5-fast-impor
t
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Ham
a
no
Mer
g
e branch
'
jm/m
a
i
n
t-1
.
6
.
5-grep
-
NUL
-
t
erminate'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Fix "ch
e
ckout A
.
.
.
" synonym for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
H
amano
sta
t
us: don't require the r
e
posit
o
ry to be
w
ritable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
bra
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: honor NO_CURL
w
hen setting REMOT
E
_C
U
RL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tar
m
igan Casebo
l
t
i
dent
.
c
:
rep
l
ace fprintf with fputs to suppress compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
N
gu
y
ễn Thá
i
Ngọ
c
Du
y
rm: on
l
y ref
r
esh entries that we
m
ay touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Rip
t
on
bisect:
fix s
i
ngular
/
pl
u
ra
l
g
r
ammar n
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
Wa
l
ton
cv
s
import: standarize syst
e
m
(
) calls
t
o
e
xternal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walt
o
n
c
v
s
imp
o
rt: sta
n
darize open() calls to e
x
t
ernal gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wal
t
on
cvsimpor
t
:
modernize callouts
t
o git subcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ham
a
no
Merge bran
c
h '
m
aint-1
.
6
.
4' in
t
o main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Ha
m
ano
M
e
rge
b
ranch 'maint-1
.
6
.
3' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hamano
M
e
rge branch 'maint-1
.
6
.
2'
into
m
aint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Haman
o
Merge commit '
v
1
.
6
.
4
.
4
-
8
-g
8
de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Fix
m
is-backport of t
7
002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Update draft rele
a
se notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Haman
o
U
p
date
draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C H
a
mano
M
e
rge branch 'dp/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
am
a
no
Merg
e
branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
Merge branch
'pc
/
un
i
n
terest
i
ng
-
subm
o
dule-disa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Hama
n
o
Merge branc
h
'nd/
i
nc
l
ude-te
r
mios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branc
h
'
j
s/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andrea
s
Gru
e
nbacher
builti
n
-apply
.
c:
f
ix the --- and +++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
n
i
el Barkalow
Replace pa
r
se_blob() with
an e
x
planat
o
r
y co
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch '
j
m/ma
i
n
t
-1
.
6
.
5-grep-NUL
-
t
e
rminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
Me
y
ering
g
r
ep: NUL term
i
nate
i
np
u
t from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
n
dreas Grue
n
bacher
bu
i
ltin-apply
.
c: Skip file
n
ames without enough comp
o
nents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
symlinks
.
c
:
r
emove
unused func
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hama
n
o
ob
j
ect
.
c
:
r
emov
e
u
n
u
s
e
d functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Document that
m
erge
strategie
s
can no
w
take thei
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Exten
d
merge-sub
t
ree tests
to
t
est -Xsubtree=di
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Ma
k
e "subtree" part more orthogonal t
o
t
h
e rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
man
o
pull:
F
ix parsing
o
f -X<
o
ptio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
Teach gi
t
-pull to pass -X<option> to git-
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Av
e
ry Pennarun
git
m
erge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Update
d
raft release notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C Haman
o
Merge branch 'tc/test-locate-h
t
tpd
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merge branch 'jh/commit-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
Mer
g
e branch 'jn/makefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
Merge
branch
'jc/maint-1
.
6
.
1
-
chec
k
out-m-c
u
stom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge
b
r
anc
h
'
t
c/clone-v-p
r
ogress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
m
a
n
o
Merge
br
a
nch 'tc/smart-http-
r
estrict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hamano
Mer
g
e branch
'
jk/run-command-u
s
e-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
m
a
n
o
Upd
a
te COPYING with GPLv2 wit
h
new F
S
F address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
user_id
e
nt_sufficiently_g
i
ven(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hama
n
o
user_iden
t
_
s
uffici
e
ntly_
g
iven(): refac
t
or the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor
c
onflict-marker-si
z
e
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere
:
prepare for customizable
conflic
t
mar
k
er length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::pri
n
t_summary: do n
o
t release t
h
e
f
or
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
c
o
nflict-marker-si
z
e:
n
ew
a
ttri
b
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
re
r
ere: use
ll_merge() inste
a
d of usi
n
g x
d
l_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
merge-tre
e
: u
s
e
l
l_merge()
n
ot x
d
l_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
x
dl_
m
erge(
)
:
allow pas
s
i
n
g
d
own marker_size in xmpa
r
am_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
xdl_merg
e
(
):
i
ntrod
u
ce xmparam_t for merge spe
c
ific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next