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
Refactor notes concatenation into a flexible interface for combining notes
2010-01-23
J
un
i
o
C H
a
mano
M
e
rge
b
ra
n
ch 'jc/m
a
int-limit-note-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C H
a
man
o
Merg
e
branch
'
nd/ls-file
s
-sp
a
rse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
g
i
t-mv: fix moving mo
r
e than
one
s
ource to a
s
i
n
gle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Haman
o
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C Hamano
m
e
r
g
e-recurs
i
ve: do not
r
eturn NULL only
t
o
caus
e
segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
F
i
x "l
o
g --onelin
e
" not
t
o sh
o
w
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
conflict-marker-size: add test
and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
Haman
o
U
p
date draft
r
el
e
ase notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
bw/cvsimpor
t
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch
'
jc/c
h
e
c
k
out-me
r
ge-base'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Haman
o
Merge branch 'a
g
/patch-header
-
verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branch 'j
c
/conflict
-
mark
e
r-size'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Merge
branch 'ag/mai
n
t
-
appl
y
-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hama
n
o
M
erge br
a
nch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge
branch 'nd/status-partial-refre
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
M
erg
e
remote branch
'
r
e
m
ot
e
s/tra
s
t-do
c
/f
o
r-next
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jh/notes' (e
a
rly part)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
am
a
no
Me
r
ge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch
'
jc/mai
n
t-ref
r
esh-index-is
-
opt
i
ona
l
-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Fi
x
"log" f
a
m
ily not to
b
e
too agressive about
s
howin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge
branch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
r
ge bra
n
ch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'js/e
x
ec-erro
r
-report'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'jc/ls-file
s
-ign
o
red-pa
t
hsp
e
c
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C
Hamano
Merge bran
c
h 'jc/g
r
ep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'jc/mai
n
t-strbuf-add-fix-doubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge br
a
nc
h
'
mm/c
o
nflict-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
Haman
o
M
erge bran
c
h
'
d
a
/d
i
fftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
c
h
'n
s
/rebase-
a
uto-
s
qu
a
s
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch
'
m
h/rebase-fixup' (
e
arl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merg
e
bra
n
ch 'il
/
push-set
-
upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
erge branc
h
'j
k
/
w
a
rn-
a
utho
r
-com
m
it
t
er-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'jc/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
branch
'
tr/http-pus
h
-ref-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge bran
c
h 'bk/fix-relativ
e
-gitdir-
f
ile'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'sd/cd-p-show-
t
opl
e
vel'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
ano
Merge br
a
nch 'jc
/
symbo
l
-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
dat
e
.
c: mark file-local f
u
nc
t
ion s
t
atic
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
unio
C Hama
n
o
Merge branch 'bg/maint-r
e
m
ote-u
p
dat
e
-
d
efault'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'sb/maint-
o
c
topus'
i
nto main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge branch 'bg/maint-
a
dd-al
l
-doc'
into
main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
erge
branch 'maint-1
.
6
.
5' into
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
G
i
t 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
erge branch 'j
k
/ma
i
nt-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge bran
c
h 'tr/maint-1
.
6
.
5-
b
ash-pro
m
pt-show-submodu
l
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Merge branc
h
'd
p
/m
a
int-1
.
6
.
5
-
fa
s
t-impor
t
-
n
on-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jm/maint-1
.
6
.
5-grep-NUL
-
terminate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Fix "checkout A
.
.
.
"
s
y
nonym for "chec
k
out A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status:
d
o
n
't
re
q
uire the repo
s
itory to be writab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge b
r
anch 'maint
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'mai
n
t-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch 'main
t
-1
.
6
.
2'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge commit '
v
1
.
6
.
4
.
4-8-g8d
e
6518' in
t
o mai
n
t-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Hamano
F
i
x mis-backport of
t
7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Upd
a
te draft
release
note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
Update draft releas
e
n
o
tes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
M
e
r
g
e branch '
d
p/m
a
int-1
.
6
.
5
-
f
ast-im
p
ort-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
mano
Me
r
g
e branc
h
'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Haman
o
Merge br
a
nch 'p
c
/uninteresting-submodu
l
e-di
s
appea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Haman
o
Me
r
ge bra
n
ch '
n
d/include-te
r
mi
o
s-fo
r
-osol'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
amano
Merge branch '
j
m/m
a
int-
1
.
6
.
5-grep-NUL-terminate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C Hamano
symlinks
.
c:
re
m
ove
u
nuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
object
.
c
:
remove unu
s
ed functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Docume
n
t that
m
er
g
e stra
t
egies can
n
o
w take th
e
ir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Ham
a
no
M
ake "subtre
e
" p
a
rt more orthogo
n
al to the
r
est of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix parsing of -X<o
p
tion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Upda
t
e draft rel
e
ase 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 't
c
/te
s
t-locate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge
bran
c
h 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge bran
c
h '
j
n/ma
k
efile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
anch 'j
c
/maint
-
1
.
6
.
1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
M
e
rge branch
'
tc/clon
e
-v
-
progre
s
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge
branch 'tc/smart-http-restri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge branch 'jk/run-comman
d
-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
M
e
rg
e
bra
n
ch 'sr/g
f
i-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
U
p
date COPY
I
NG
w
i
th GPLv2 with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
us
e
r_
i
dent_suf
f
iciently_given(
)
: refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficiently_gi
v
en(): refa
c
t
o
r
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor
c
onflict-m
a
r
k
e
r-size attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rerere: prepare for
customi
z
ab
l
e
co
n
flict m
a
r
ker lengt
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
c
ommit
.
c::pri
n
t_summar
y
: do not
r
elease the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-marker-s
i
z
e: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
ama
n
o
rerere
:
use ll_merg
e
() i
n
stead of using
xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
m
e
rge-tree: use ll_merge() not
x
dl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_mer
g
e(): allo
w
p
a
ssing down marker_size in xmp
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
x
dl_merge(): introduce xmparam_t
f
or merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
g
it_attr(): fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
ma
n
o
Merge
branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
Hamano
grep --no-i
n
dex
:
allo
w
u
se of "gi
t
grep" ou
t
side
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C
Hamano
g
r
ep: prepare
t
o run outs
i
de
o
f a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
Merge branch 'jc/checko
u
t-m
e
r
g
e
-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e br
a
nch 'rs/maint-a
r
chive
-
m
atch-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
i
o C Hamano
Merge branch
'
i
l/vcs-h
e
lper'
commit
|
commitdiff
|
tree
next