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
S
ixt
M
a
ke test case number
s
unique
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
H
amano
co
n
f
l
ict-marke
r
-size:
a
d
d
t
e
st and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
n
o
Update
draft release
n
otes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
aman
o
M
erge branch 'b
w
/cv
s
import'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hama
n
o
M
e
r
g
e
branch 'j
c
/checkout-m
e
rge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Merge branc
h
'ag/pa
t
ch
-
hea
d
er-ver
i
fy'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge
b
ranch 'j
c
/conflic
t
-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch 'ag/maint-app
l
y-too
-
l
a
r
g
e
-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Mer
g
e branch 'ap/me
r
ge-
b
ackend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
ma
n
o
Merge bran
c
h 'n
d
/
s
tat
u
s-partial
-
refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
remote branch 'remot
e
s/
t
rast-doc/fo
r
-
n
ext
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Ham
a
no
M
erge branch
'jh/notes' (early
p
art)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
M
erge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
ma
n
o
Merge branch
'
j
c/maint-ref
r
esh-ind
e
x-is-opt
i
onal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Merge branch 'jc/cach
e
-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Me
r
ge bran
c
h
'js/exec-error-repo
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
ma
n
o
M
e
rge branc
h
'
j
c/ls
-
files-ign
o
r
e
d-p
a
th
s
p
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch '
j
c/grep
-
l
o
okah
e
ad'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'jc/
m
aint-s
t
rb
u
f-add-fix
-
doubling
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
am
a
no
M
e
rge branch 'mm/co
n
flict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branch
'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'm
h
/rebase-
f
ixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge bran
c
h '
n
s/reb
a
se-auto
-
squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/
r
e
base-fixup' (early pa
r
t)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
no
Merge
b
ranch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Haman
o
M
e
rge bran
c
h '
j
k
/war
n
-author-committe
r
-after-
c
ommit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge branch 'jc/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
m
ano
Merge branch 'tr
/
http-pu
s
h-ref-s
t
atus'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Merge branch 'b
k
/fix-relativ
e
-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge branch '
s
d
/cd-p-
s
h
o
w-
t
oplev
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
Merge
b
ra
n
ch 'jc/sym
b
ol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
d
a
t
e
.
c: mark file
-
local
f
un
c
tion
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Sync
w
ith 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
branch 'bg/maint-remote-updat
e
-defaul
t
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'sb/m
a
i
n
t
-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'bg/maint-add-all-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Haman
o
Merge
b
ranch '
m
aint-1
.
6
.
5' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
m
ano
Merg
e
branch 'jk/maint-1
.
6
.
5-reset-har
d
' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'tr/m
a
int-1
.
6
.
5
-bash-prompt-sho
w
-
subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'dp/maint-1
.
6
.
5-f
a
st-im
p
or
t
-non-com
m
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge branch
'
jm/mai
n
t
-1
.
6
.
5-
g
rep-NUL
-
t
e
rmina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
F
ix "
c
heckou
t
A
.
.
.
" s
y
nonym fo
r
"che
c
kout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
status: don't
require the reposi
t
ory to be
writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Mak
e
fil
e
:
honor NO_CURL when setting
R
EMOTE_CURL
_
*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
ident
.
c: r
e
place
f
printf with fputs to sup
p
ress compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thá
i
Ngọc
Duy
rm: on
l
y r
e
fresh entries that
we may t
o
uch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Davi
d
R
ipton
bisect:
f
ix sin
g
ul
a
r/plu
r
al gra
m
m
a
r nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
en W
a
lton
cvsim
p
ort: standarize syst
e
m() cal
l
s t
o
e
xternal git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wa
l
ton
c
v
si
m
port: standari
z
e
o
p
en() calls to external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
c
v
simport:
m
oderniz
e
callouts t
o
g
it subcom
m
a
n
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C
Hamano
Merg
e
branch
'
maint-1
.
6
.
2'
i
nto
m
a
i
nt-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4
-8-g8d
e
651
8
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
H
amano
F
i
x mis-b
a
ckp
o
r
t
of t70
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Upda
t
e d
r
aft r
e
lease notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Update d
r
aft rel
e
a
s
e
n
otes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge
b
ran
c
h 'dp/maint-1
.
6
.
5
-f
a
s
t
-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Me
r
ge branch 'jc/rere
r
e'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ha
m
ano
M
erge bran
c
h 'pc/uninterestin
g
-
s
u
b
module-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
M
erge
b
ranch 'n
d
/include-termio
s
-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
ma
n
o
M
e
r
ge bra
n
ch 'js/windows
'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenbach
e
r
builtin-apply
.
c
:
fix
t
he ---
a
nd +++ heade
r
file
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Dan
i
e
l Bark
a
low
R
e
p
l
ace parse_blob()
w
ith an
explan
a
tory comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Me
r
ge br
a
nch 'jm/main
t
-
1
.
6
.
5-g
r
ep-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Me
y
e
ring
gr
e
p: N
U
L terminate in
p
ut fro
m
a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
ndreas Gruenbacher
buil
t
in-apply
.
c
: Skip filenames witho
u
t e
n
o
ugh components
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
syml
i
nks
.
c:
remove un
u
s
e
d functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
o
bje
c
t
.
c: r
e
move unused functi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hama
n
o
Document that merge strategies can n
o
w take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
Pennarun
Ext
e
nd
m
e
rge-subtree tests to test -Xsubtree
=
dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Haman
o
Make "s
u
btre
e
" part more
o
rthogonal to the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
m
ano
pull: Fix parsi
n
g of -X<o
p
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach
git-pull to pa
s
s
-
X<option> to g
i
t-m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
v
e
r
y
Pe
n
narun
git
m
e
r
ge -X<op
t
i
on>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Update draft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
man
o
Merge branc
h
'
tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Mer
g
e
b
ranch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
a
mano
Merge branch 'jn/mak
e
file'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge bra
n
ch
'
jc/maint-1
.
6
.
1-check
o
ut
-
m-custom-
m
e
rge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
Merge br
a
nch '
t
c/c
l
o
n
e-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge
b
ranch '
t
c
/
smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
mano
Me
r
ge bran
c
h 'jk/run-command-use-shel
l
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
M
e
rge
b
ranch
's
r
/gfi-o
p
tions
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Updat
e
C
O
PYING wi
t
h GPLv2 with new FSF add
r
es
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
user_ident_su
f
ficiently_given(): refa
c
tor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
user_id
e
n
t
_
suffici
e
ntly_given(
)
: refactor the
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
r
er
e
: hono
r
c
onfli
c
t-marke
r
-size attribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
rerere: prepare f
o
r
c
u
s
tomizable conflict marker l
e
ngth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
comm
i
t
.
c::print_su
m
mar
y
: do not release the form
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
conflict-marke
r
-size: new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Ha
m
a
no
r
e
rere: us
e
l
l_merge() instead of u
s
i
n
g xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
ama
n
o
merge-tre
e
: use ll_
m
erge() no
t
xdl_merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
x
dl_merge(
)
: a
l
low pas
s
ing down m
a
rker_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge
(
): introd
u
c
e
x
mpara
m
_t for merge spe
c
i
f
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next