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
Merge branch 'nd/ls-files-sparse-fix'
2010-01-23
Junio C Hamano
Merge branch
'
nd/ls-files-
s
p
a
rse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
git-mv:
fix
m
oving more than one sou
r
c
e
to a single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-r
e
c
u
rsive:
do not ret
u
rn NULL only to c
a
use segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hama
n
o
c
onf
l
ic
t
-
m
ar
k
er-size
:
add te
s
t
a
nd docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Updat
e
draft rele
a
s
e
notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
H
a
mano
Merge branch 'jc/checkout-merge
-
base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge
bra
n
ch 'ag/patch-h
e
ade
r
-verify'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merg
e
branch 'j
c
/conflict-marker-si
z
e
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C
H
amano
Merge branch 'ag
/
main
t
-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge branc
h
'ap/merge-backend-o
p
ts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merg
e
br
a
nch
'
nd/status-partial-refre
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge r
e
m
ote branch '
r
emotes/trast-doc/for-nex
t
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
M
e
r
ge branch 'jh/notes'
(
e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hama
n
o
Mer
g
e
b
ranch 'jc
/
main
t
-r
e
fres
h
-i
n
dex-is-optional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch
'
rr/c
o
r
e-tu
t
orial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/cache-
u
nmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
erge br
a
nch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge b
r
anch 'j
c
/
ls-files-ignored-pathspe
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rg
e
branch 'j
c
/
grep-
l
ooka
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Me
r
ge
b
ranch 'j
c
/maint-strbuf-add-fix-doubl
i
ng'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge bra
n
ch
'm
m
/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge bran
c
h
'
d
a
/difftool'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
erge br
a
nch
'mh/rebase
-
f
i
xu
p
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge branch 'ns/
r
ebase-auto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Mer
g
e
b
ranch 'mh/re
b
ase-f
i
xup' (early part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
M
e
r
g
e bra
n
ch 'jk/warn-a
u
thor-committe
r
-aft
e
r-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
't
r
/http
-
push-ref-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C
Hamano
Mer
g
e b
r
an
c
h
'
bk/fix-relative-gitdir-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'sd/cd-p-sh
o
w-t
o
plev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Ha
m
ano
Mer
g
e bran
c
h 'jc/s
y
mbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
da
t
e
.
c: ma
r
k
file
-
local function s
t
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio 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 Ham
a
no
G
i
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'bg/maint-remote-update
-
d
e
fault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Me
r
g
e bra
n
ch 'sb/maint-octopus
'
i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merg
e
branc
h
'bg/maint-a
d
d-a
l
l-
d
oc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Mer
g
e
b
ranch
'
m
aint-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
Jun
i
o C H
a
mano
Merge branch 'jk/maint-1
.
6
.
5-rese
t
-hard' i
n
to main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
a
mano
Merge branch
'tr/maint-1
.
6
.
5
-
b
a
sh
-
prompt-show-
s
ubmo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branc
h
'
d
p/maint-1
.
6
.
5-f
a
st
-
i
mport-non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ha
m
ano
Merge
b
ra
n
ch 'jm
/
maint-1
.
6
.
5
-
grep-NUL-termi
n
a
te' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
ano
Fix "
c
heckout
A
.
.
.
" synonym fo
r
"ch
e
c
k
ou
t
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
s
t
atus: do
n
't r
e
quir
e
the repos
i
tory to
b
e
writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merg
e
b
r
anc
h
'maint
-
1
.
6
.
4' into
m
ain
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge branch 'maint-1
.
6
.
3' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C H
a
mano
Merge bra
n
ch 'mai
n
t-1
.
6
.
2' into maint-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
comm
i
t
'
v1
.
6
.
4
.
4-8-g8de651
8
'
i
nto mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Ham
a
no
Fix mis-backpor
t
of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Updat
e
draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Upda
t
e draft
r
e
lease notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ham
a
no
Merge branch 'dp/
m
aint-1
.
6
.
5-fast
-
i
mport-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge
b
ra
n
ch
'
jc/rer
e
re
'
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Ha
m
an
o
Merge b
r
anch 'pc/uninteresting-
s
ubmo
d
ule-disa
p
p
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Me
r
ge branc
h
'nd/includ
e
-termios-fo
r
-osol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
Merge branch 'jm/maint-1
.
6
.
5-gre
p
-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
s
ymlink
s
.
c: remove unused functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
ob
j
ect
.
c:
r
e
move unused func
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Document that merge strategies
c
an now tak
e
t
h
eir
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Ma
k
e "su
b
tree
"
part mo
r
e o
r
thogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
pul
l
:
F
ix parsi
n
g of -X
<
opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
man
o
Update draft rel
e
a
s
e
not
e
s to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
M
e
rge branch 'tc/test
-
locate-ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio
C H
a
mano
Merge br
a
nc
h
'j
h
/commit
-
status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merg
e
b
r
anch 'j
n
/make
f
ile'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C
Hamano
Merg
e
branch 'jc/m
a
i
n
t-1
.
6
.
1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
M
e
r
ge branch
'
tc
/
clone-v-
p
rogress'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch
'
tc/smart-ht
t
p-restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
mano
M
erge branch
'
jk/run-command-
u
se-shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ham
a
no
Merge branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
Up
d
ate COPYING with
G
P
Lv2 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_ide
n
t_sufficiently_give
n
(
)
: r
e
facto
r
the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user
_
ide
n
t_sufficien
t
l
y_given(): refa
c
to
r
the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
h
o
nor co
n
flict-ma
r
ker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rerere: prep
a
r
e for customizab
l
e
c
onflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::print_summary
:
do 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
conflict-
m
a
rker-size: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
re
r
ere
:
use ll_merge
(
) instead o
f
using xdl_mer
g
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tr
e
e
: use ll_merge() not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
x
d
l
_
m
e
r
ge()
:
all
o
w passing down marker_size in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merg
e
(): introdu
c
e
xmparam_t for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
gi
t
_attr
(
): fix function sign
a
ture
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
Merge
branch 'cc/r
e
set-m
o
r
e'
commit
|
commitdiff
|
tree
2010-01-15
J
unio C
Hamano
g
r
ep --no-index: allow use
o
f "git
grep" outsid
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io C Ha
m
ano
grep: prep
a
r
e
to run o
u
tsi
d
e of a work tre
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
Merge
bran
c
h 'jc/check
o
ut
-
merge-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
Mer
g
e br
a
nch 'rs/
m
aint-ar
c
hive
-
match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
Merge branch 'il/vcs
-
he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
s
trbuf_addbuf()
:
al
l
ow passing th
e
same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
M
e
rge branch 'cc/reset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o C Ham
a
no
Merge bran
c
h 'n
d
/sparse'
commit
|
commitdiff
|
tree
next