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
Remove diff machinery dependency from read-cache
2010-01-22
Lin
u
s Torvald
s
Remove
d
i
f
f machinery d
e
pendency from
r
ead-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Horst H
.
v
o
n Br
a
nd
git
-
rebase
.
txt: Fix spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Sixt
M
a
k
e
'r
e
re
r
e
forget' work from a subdire
c
tory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Sixt
Make test ca
s
e n
u
mbers un
i
que
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ha
m
ano
con
f
li
c
t-marke
r
-size: add
test and do
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update draf
t
release note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h
'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Ha
m
ano
Merge
b
ranch 'j
c
/checkou
t
-
me
r
ge-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
ag/p
a
tc
h
-h
e
ader-verify'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge branch
'j
c
/
c
onflict-m
a
rker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Hama
n
o
Merge b
r
anch 'ag/maint-app
l
y-
t
oo-
l
arg
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
branch 'a
p
/merge-b
a
ckend-op
t
s'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
a
mano
Merge branch 'nd/status
-
partial-refresh
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge remo
t
e
bran
c
h
'
r
e
motes/tra
s
t-doc/fo
r
-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge br
a
n
ch 'jh
/
n
otes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rg
e
branch 'jc/ma
i
nt-
r
efr
e
s
h
-
index-is-o
p
ti
o
n
al-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Merge br
a
nch 'rr/cor
e
-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
r
a
n
c
h 'jc/cache-unm
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
Merg
e
branch
'
js/
e
xec-e
r
ror
-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merg
e
branch 'jc/ls
-
files-i
g
n
o
r
e
d-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
a
mano
M
erge b
r
anch
'
jc
/
grep-
l
ookahea
d
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
m
a
n
o
Merge br
a
nch 'jc/ma
i
nt-strb
u
f-add-fix
-
doubl
i
ng'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
a
m
a
n
o
M
e
rge branch
'
mm/conflict-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'da
/
d
ifftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
M
e
rg
e
branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Merge branch 'ns/rebase-auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
erge branch
'
m
h
/reba
s
e-fixup'
(ear
l
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branch
'
i
l/push-set-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'jk/
w
arn-author-committ
e
r
-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/id
e
n
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Merge
bra
n
ch
'
tr/htt
p
-push-ref-statu
s
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'bk/fix
-
r
elative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge br
a
nch 'sd/cd-p-sho
w
-topleve
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
e
r
ge branch 'j
c
/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
date
.
c: mark f
i
le-l
o
cal funct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
amano
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Git
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
mano
Merge branch 'bg/
m
a
int-remote-update-default'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
Merge branch 'sb/ma
i
nt-octopus' into
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch
'
bg/m
a
int-a
d
d-all
-
doc'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
e
rge br
a
nch
'maint-1
.
6
.
5
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge br
a
nc
h
'
j
k/maint-1
.
6
.
5
-reset-hard' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
a
ma
n
o
Me
r
ge
br
a
nch 'tr/maint-1
.
6
.
5-ba
s
h
-pr
o
mp
t
-
show-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merg
e
branch 'dp/maint-1
.
6
.
5-fa
s
t-import
-
non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
b
ra
n
ch 'jm/main
t
-1
.
6
.
5-grep-
N
U
L-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
n
o
Fix "c
h
eckou
t
A
.
.
.
"
syn
o
nym
f
o
r "ch
e
ckout
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
ma
n
o
status: d
o
n't require the repository to be writa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Make
f
ile: hon
o
r NO_CURL
w
hen setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
T
a
r
migan Casebolt
ident
.
c: replace fprintf with
f
p
u
t
s to suppr
e
ss compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái Ngọ
c
Duy
rm: only
ref
r
esh
entries t
h
at we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisect: fix sin
g
ular/plural grammar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Be
n
Walton
cvsim
p
ort: standarize sy
s
tem() calls to e
x
ternal
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walt
o
n
c
vs
i
mp
o
rt: standar
i
ze open() calls to
e
xternal g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
en Walton
cvsi
m
port: mo
d
e
r
nize call
o
uts to g
i
t
s
ubcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge br
a
n
c
h 'maint-1
.
6
.
4'
i
nto mai
n
t-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e branch 'maint-1
.
6
.
3'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-
1
.
6
.
2
'
into mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
M
e
r
ge commit 'v1
.
6
.
4
.
4-8-g8de6518' into ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
a
no
Fix mis-
b
ac
k
p
ort of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C Hamano
U
pd
a
te d
r
a
f
t re
l
ease not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
U
pd
a
te draft
release n
o
tes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch '
d
p
/maint-1
.
6
.
5-fast-import-non-co
m
m
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
branch 'j
c
/rerere
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Ham
a
no
Merge
b
ranch 'pc/uninterestin
g
-
submo
d
u
l
e-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Hamano
Mer
g
e branch 'nd/incl
u
de-t
e
rmios-for-
o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Me
r
ge branch
'
js/w
i
n
d
ows
'
commit
|
commitdiff
|
tree
2010-01-19
A
ndreas Gruenbacher
b
uiltin-a
p
ply
.
c: fix the
-
-- and ++
+
header fi
l
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
aniel Barkalow
Replace
p
arse_blob() with a
n
e
x
planatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge
branch 'jm/maint
-
1
.
6
.
5-gre
p
-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
g
r
ep: NUL terminate input fro
m
a
f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Grue
n
b
a
c
h
er
bu
i
lti
n
-app
l
y
.
c:
S
kip filenames without
e
no
u
gh components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
syml
i
n
k
s
.
c:
remove unused
fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C Ha
m
ano
o
bject
.
c: re
m
ove
u
n
used fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
D
oc
u
ment that merge strategies can now take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Exten
d
me
r
ge-su
b
tre
e
tests to
t
e
s
t
-Xsubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
M
a
ke "su
b
tr
e
e"
par
t
more
o
rthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Ham
a
no
pu
l
l: Fix pa
r
si
n
g of -X<
o
p
tion
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y P
e
nnarun
Teach git-pul
l
to pass -X<opti
o
n
>
to git-mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penna
r
un
git merge -X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Up
d
a
te dr
a
ft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Merge branch 'tc/test
-
locate-ht
t
pd
'
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ham
a
no
M
erge
b
ranch 'jh/co
m
mi
t
-status'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hama
n
o
Merge br
a
nch 'j
n
/makefile'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Mer
g
e branch 'jc/m
a
i
n
t-1
.
6
.
1-checko
u
t-m
-
custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
t
c/clone-
v
-prog
r
ess'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge b
r
a
nch 'tc/smart-http
-
r
estrict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge branch 'jk/run-com
m
a
n
d-use-sh
e
l
l
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
Merg
e
branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
U
p
d
a
t
e CO
P
YING wit
h
GPLv2 with
n
e
w FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficien
t
ly_given(
)
:
refac
t
o
r the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
user_ident_suffici
e
ntly_given(): refact
o
r
the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
an
o
rerere: hon
o
r conflict-marker-size at
t
ri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Haman
o
rerere: pre
p
are fo
r
customizable
conflic
t
m
arker l
e
n
g
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
a
mano
commit
.
c::print
_
summary: do not
relea
s
e t
h
e forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
conflict-marker-s
i
ze: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerer
e
: u
s
e ll_merge
(
) instead of
u
s
i
ng xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next