repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
conflict-marker-size: add test and docs
2010-01-21
Juni
o
C H
a
mano
conflict-marker-size: a
d
d test and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Update draft release notes
t
o 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Me
r
ge b
r
anch
'
b
w
/cvs
i
mp
o
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
H
amano
M
e
rge branc
h
'
jc/checkou
t
-merg
e
-base'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hama
n
o
Merge branch 'ag/patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge br
a
nch 'jc/c
o
nfli
c
t
-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch 'ag/maint-apply-too-large
-
p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branc
h
'ap/merge-b
a
ckend-o
p
t
s'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ham
a
no
Merge branch
'
nd/status-
p
artial-ref
r
esh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
M
e
r
ge remote
b
ra
n
ch '
r
emotes/trast-doc
/
for-next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ham
a
no
M
er
g
e branch 'jh/notes' (early
p
art)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
Hamano
Merg
e
br
a
nch
'jc/maint
-
refr
e
sh-index-
i
s-optio
n
al-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'rr/c
o
re-t
u
torial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
b
ranch '
j
c/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Me
r
ge branch 'js/exec-error-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch
'
j
c/ls-fil
e
s
-
ignored-paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge b
r
anch 'jc
/
grep-looka
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merg
e
b
r
anch 'jc/ma
i
n
t
-
strb
u
f-add-fix-d
o
ub
l
ing'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mm/confl
i
ct-advice
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
M
e
rge b
r
anch 'da
/
difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge branch 'mh
/
r
ebase-
f
i
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merg
e
bra
n
ch
'ns/rebase-auto-squ
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Me
r
ge bran
c
h 'mh/rebas
e
-f
i
xup' (early
part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merg
e
bra
n
c
h 'il
/
p
ush-set
-
u
p
stream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
b
ran
c
h 'jk
/
wa
r
n-aut
h
or-committ
e
r-after-comm
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merge branch 'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge branch
'
tr/http-pu
s
h-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Me
r
ge branch 'bk/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merg
e
branch
'
j
c/symb
o
l-
s
tatic'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
dat
e
.
c: mark file-loc
a
l function static
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 Hamano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch
'
b
g/maint-remote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sb/maint-octopu
s
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'
bg/maint-add-all-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
bran
c
h '
m
aint-1
.
6
.
5' into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge
b
ra
n
ch '
j
k/maint-1
.
6
.
5-re
s
et-har
d
' i
n
to m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'tr/maint-1
.
6
.
5-bash-prom
p
t-
s
how-submodu
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'dp/maint-1
.
6
.
5-fast
-
i
m
port-non
-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Merge branch 'jm/ma
i
nt-
1
.
6
.
5-grep-N
U
L-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Fi
x
"ch
e
c
k
out A
.
.
.
"
s
y
no
n
ym for "
c
h
e
ckout A
.
.
.
H
EAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
status: don't req
u
ire the repositor
y
to be
w
r
i
table
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johan
n
e
s
Sixt
Mak
e
file:
h
onor NO
_
C
U
RL when
s
etting REMOTE_C
U
R
L_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
iden
t
.
c:
r
eplace fpri
n
tf w
i
th
f
puts
t
o suppress compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
N
g
u
yễn Thái Ngọc Duy
r
m
:
only re
f
resh
entries that we may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisect
:
fix singular/plur
a
l
gramma
r
nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n
Walton
cvsimp
o
rt: stand
a
rize sys
t
em
(
) cal
l
s to
e
xternal git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: s
t
andari
z
e ope
n
() calls t
o
external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
en
W
alton
cv
s
import: modernize ca
l
louts t
o
git s
u
bco
m
mands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Merge branch 'maint-1
.
6
.
4
' i
n
to
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merg
e
b
ranch 'maint-1
.
6
.
3' into m
a
int-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch 'maint
-
1
.
6
.
2' into m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Ha
m
an
o
Merge commit
'v1
.
6
.
4
.
4
-
8-g8de65
1
8'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Fix mis-backport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Upda
t
e draft rele
a
se
n
otes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hama
n
o
Merge
b
ran
c
h '
m
ain
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft relea
s
e
notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
H
a
man
o
Merge br
a
nch 'dp/main
t
-
1
.
6
.
5-fast-imp
o
rt-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merg
e
branc
h
'
pc/unin
t
e
r
esting-submo
d
ule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge bra
n
ch
'
n
d/include
-
termio
s
-for
-
osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Mer
g
e
branc
h
'
js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gr
u
enbache
r
built
i
n-apply
.
c: f
i
x
t
h
e --- an
d
+++ header filena
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Rep
l
a
c
e parse_blob() with an expl
a
nat
o
ry comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e br
a
nc
h
'jm/maint-1
.
6
.
5-gre
p
-NUL-te
r
minate'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
i
m Meyering
grep:
NUL terminate input
from a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
An
d
reas Gr
u
enbache
r
b
u
i
l
tin
-
ap
p
ly
.
c: Skip f
i
l
enames without enough compone
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlin
k
s
.
c:
remove u
n
used functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
object
.
c:
r
emov
e
u
nused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C
Ham
a
no
Document t
h
at mer
g
e strategies can now
take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Pennarun
Exte
n
d mer
g
e-subtree tests to test -
X
subtree=
d
ir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Ham
a
n
o
Mak
e
"subtr
e
e
" part
m
o
r
e
o
rthogonal to the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Haman
o
pull:
Fix pars
i
ng of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennaru
n
Teach git
-
pull to pas
s
-X
<
opt
i
on> to git
-
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Pennarun
git m
e
rge -X<op
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update
d
raft release
not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Ha
m
a
no
M
e
rge
branch '
t
c/test-
l
ocate-htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commi
t
-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
Merge branch 'jn/m
a
ke
f
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
no
Merge
bran
c
h
'j
c
/maint-1
.
6
.
1-checkout-
m
-custo
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
Merge branch 't
c
/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
Mer
g
e branch 'tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branc
h
'j
k
/r
u
n-
c
omm
a
nd-use
-
shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Haman
o
Merge branch '
s
r/gfi-o
p
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPYING with GPL
v
2 with
n
e
w FSF ad
d
ress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user
_
ident_sufficiently_
g
iven
(
): refact
o
r the lo
g
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C
H
amano
user_ident_
s
ufficiently_given(): refactor
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
r
e
r
er
e
:
honor con
f
l
i
c
t-
m
ar
k
er-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepa
r
e
for customi
z
a
ble conflict marker
length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
commi
t
.
c::prin
t
_summary: do n
o
t release the form
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Haman
o
conflict-marke
r
-si
z
e: new attrib
u
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
rerere: use ll_merge(
)
instead of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
m
erge-tree: use ll_merge() not xdl
_
m
er
g
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
x
d
l_merge():
a
ll
o
w passing d
o
wn
m
a
r
k
e
r
_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
xdl
_
merge()
:
introduc
e
xmpar
a
m_t for merg
e
s
p
e
c
i
f
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_att
r
()
:
f
i
x
f
unction signatu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next