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 "git hash-object" a built-in
2010-01-21
Junio C Ham
a
no
confli
c
t-mar
k
er-s
i
ze: add
t
est and
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
ama
n
o
Update dra
f
t
r
elease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Ham
a
no
Merge branch 'bw/cvsi
m
port'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Me
r
ge branch 'j
c
/
c
hec
k
out-merge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C Hama
n
o
Merge branch
'
ag/patch-header
-
veri
f
y
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
am
a
no
Merge bra
n
ch 'jc/
c
onflict
-
marker-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C H
a
mano
Merge branch 'ag/ma
i
nt-
a
pply-too-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge b
r
anch '
a
p/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'nd
/
status
-
p
artial
-
refresh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Merge
remote branch 'remotes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge bran
c
h 'jh/notes' (earl
y
pa
r
t)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
no
Me
r
ge b
r
a
n
ch 'jc/maint-refresh-index-
i
s
-optional-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hama
n
o
Me
r
ge
branch '
r
r/co
r
e-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/cache-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
j
s/exec-error-
r
eport'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
a
n
o
M
e
rge branch
'jc/ls-files-igno
r
ed-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
M
e
rge branch 'j
c
/grep
-
l
o
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
branch '
j
c/maint-strbuf-a
d
d-
f
ix
-
doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'mm/co
n
fl
i
c
t
-
advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge branc
h
'da/dif
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'mh/rebase-
f
ixup'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
mano
Merge bran
c
h
'
ns/reb
a
se-au
t
o-s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hama
n
o
Merge branch 'mh/reb
a
se-fix
u
p
' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Mer
g
e
branch 'il/push-s
e
t
-
ups
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch
'jk/war
n
-a
u
thor-com
m
itter-
a
fter-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ranch 'tr
/
h
ttp-push-r
e
f
-
s
t
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'bk
/
f
ix-relat
i
ve
-
gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge b
r
anch 's
d
/c
d
-p-show-topl
e
v
el
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch
'jc/
s
y
mbol-st
a
t
i
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mark
f
ile-local funct
i
on
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Sync
with 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
J
unio C
Hama
n
o
Merge branc
h
'bg/maint-remote-
u
pdate-defau
l
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rge bran
c
h 'sb/maint-octopus'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
branch 'bg/maint-add-all
-
doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Haman
o
Merge branch 'maint-1
.
6
.
5
' into maint
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 Ham
a
no
M
erge branch 'jk/maint-1
.
6
.
5-reset-h
a
rd' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branc
h
'
t
r/maint-1
.
6
.
5
-bash-prompt-sho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
M
e
r
ge
bra
n
c
h 'dp/maint
-
1
.
6
.
5-f
a
st-im
p
ort-no
n
-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Merge branch 'jm/maint-1
.
6
.
5-grep
-
NUL-te
r
minat
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Fix "checkout A
.
.
.
"
s
ynonym fo
r
"checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Ham
a
no
status: don't require
t
he repositor
y
to be writa
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'mai
n
t-1
.
6
.
4' into maint
-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
m
aint-1
.
6
.
3' i
n
t
o
ma
i
nt-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Haman
o
Merge
b
ra
n
ch
'
maint-1
.
6
.
2' into
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge commit 'v1
.
6
.
4
.
4-8-g8de6518' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
mano
Fix m
i
s-back
p
or
t
o
f t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Update d
r
aft release notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Update dra
f
t release not
e
s to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merg
e
branch 'dp/maint-1
.
6
.
5
-fast-impo
r
t
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch 'jc/r
e
rere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Haman
o
Merg
e
branch 'p
c
/uninte
r
e
stin
g
-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Merge branch 'nd/
i
nc
l
u
de-ter
m
ios-fo
r
-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o C Hamano
Merge branch 'js/wind
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merg
e
br
a
nc
h
'
j
m
/
m
ain
t
-1
.
6
.
5-grep-NU
L
-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
symlinks
.
c
:
re
m
ove u
n
used fu
n
ctio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
object
.
c
:
r
e
move unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Docu
m
ent th
a
t
m
erge strategie
s
can now ta
k
e their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
Mak
e
"subtre
e
"
pa
r
t more orthogon
a
l to
t
he rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: F
i
x
p
a
rsing of -X<option
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
U
pdate draft relea
s
e notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge
branch 'tc/test-
l
o
cate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Merge branch 'j
h
/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'jn/m
a
kefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branc
h
'jc/mai
n
t
-1
.
6
.
1
-checkout-m-
c
ustom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge b
r
a
n
c
h 'tc/
c
l
o
ne-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Mer
g
e branch 'tc/s
m
a
r
t-http-rest
r
i
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'jk/run-co
m
m
a
nd-use-
s
h
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C Hama
n
o
Merge branch 'sr
/
gfi
-
op
t
io
n
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
Update COPYIN
G
with GPLv2
w
ith ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_id
e
nt_sufficient
l
y
_g
i
ven(): refactor
t
he logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_
i
de
n
t_s
u
fficiently
_
given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
rerere: honor
c
onfl
i
ct
-
marker-size at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
r
e
rere: pr
e
pare fo
r
custo
m
iz
a
ble conflict
m
arker
l
ength
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
commit
.
c::print_summary: do not rel
e
ase
t
he fo
r
mat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
c
o
nf
l
ict-marker-size: new attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rerere: use ll_mer
g
e
(
)
instead of using xdl_merg
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
merge-
t
re
e
: use ll_me
r
ge() not xdl
_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
x
d
l_merge(): al
l
ow passing down marker_
s
i
z
e in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
xdl_merge(): introdu
c
e
x
mparam_t fo
r
merge
s
pecif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
git_attr(
)
: fix funct
i
o
n
signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge b
r
a
n
c
h 'cc/reset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Hama
n
o
grep
-
-no-index: allow us
e
of "git grep" outside
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: prepare
t
o
run
o
utside of a wo
r
k tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
Merge branch 'jc/c
h
eckout
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
Merge bra
n
ch 'rs/maint-a
r
chive-match-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C
H
a
m
a
no
Merge bran
c
h 'il/vcs-
h
elpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Ha
m
a
n
o
strbuf_addbuf(
)
: allow passing th
e
same buf to d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'cc/rese
t
-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
am
a
no
Me
r
ge bran
c
h 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hama
n
o
t7
5
02: te
s
t commit
.
status, --st
a
tus and
--no
-
s
t
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
g
r
e
p:
rip out
pessi
m
i
zation to use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
io C Hamano
grep: rip out
support for external grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
next