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
builtin-notes: Add -c/-C options for reusing notes
2010-01-23
J
u
nio
C Hamano
Mer
g
e
branch
'
jc/maint-limit-note-o
u
tp
u
t'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Me
r
ge branch 'nd/ls-f
i
les-spa
r
se-fix'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
git-mv: fi
x
movin
g
more than one source
to a single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
u
n
io C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio C Hamano
merge-re
c
u
rsive: do not r
e
turn NULL on
l
y to cause segfa
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix
"log -
-
oneline" not to
s
h
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
t
est
a
n
d doc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Update
draft release
n
otes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch 'b
w
/cvs
i
mp
o
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h 'jc/c
h
ecko
u
t-
m
erge
-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C H
a
m
a
n
o
Merge branch 'ag/patc
h
-
h
eader
-
veri
f
y'
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C Hamano
Merge
b
r
anch 'j
c
/conflic
t
-marke
r
-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
a
n
c
h 'ag/
m
a
i
nt-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ha
m
ano
Merge bra
n
c
h 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
nd/status
-
partial-ref
r
esh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge rem
o
te
branch 'r
e
motes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
H
a
mano
Merge
branc
h
'jh/n
o
tes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o C
Ham
a
no
Merg
e
bra
n
ch 'jc/mai
n
t-refresh-index-is-optional-
f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Fix "log" famil
y
not to b
e
too agressive about showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hama
n
o
Merge bra
n
c
h 'rr/c
o
r
e
-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merg
e
branch 'jc/
c
ache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
branch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'jc/ls-file
s
-i
g
n
ored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'jc/grep-lo
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
M
e
rge branch 'jc/maint-strbuf-add-fix
-
doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
n
o
Mer
g
e branch
'da/di
f
ftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'm
h
/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
Merge
b
ranch 'ns/re
b
a
s
e-aut
o
-squash'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
an
o
M
erge branch 'mh
/
reb
a
se-fixup'
(
earl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge bra
n
ch 'il/pu
s
h-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
e
rge b
r
anch 'jk/warn-au
t
ho
r
-committer-a
f
t
e
r-c
o
mmit
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Ham
a
no
Merg
e
branch 'jc
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'tr/h
t
tp-p
u
sh-r
e
f
-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'bk/fi
x
-relative-gitd
i
r-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
an
c
h
'
sd
/
cd-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge
b
ranch 'jc/sym
b
o
l-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
n
o
da
t
e
.
c: mark
f
il
e
-l
o
cal funct
i
on
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Sy
n
c 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
Git
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hama
n
o
Merge b
r
anch 'b
g
/
m
aint-remote-updat
e
-
defaul
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
bra
n
ch
'
sb/maint-octopus'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Merge b
r
anch
'bg/maint-add-all
-
doc' into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
M
er
g
e 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 Hamano
Merge branch '
j
k/main
t
-1
.
6
.
5
-
reset-hard
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Merg
e
branch 'tr/maint-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'dp/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge bran
c
h 'jm/ma
i
nt
-
1
.
6
.
5
-gre
p
-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "c
h
ecko
u
t A
.
.
.
" s
y
nony
m
for "c
h
eckout A
.
.
.
HE
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
amano
sta
t
u
s: don't require th
e
repository to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
an
o
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
an
o
Merge branch 'm
a
int-1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch 'maint-1
.
6
.
3' into ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Hamano
Merg
e
bran
c
h 'main
t
-1
.
6
.
2' int
o
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge commit 'v1
.
6
.
4
.
4-8-g8de6518' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
an
o
Fix mi
s
-bac
k
port of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Update 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
Junio C Hamano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Updat
e
draft
release n
o
t
e
s to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge
b
ranch
'dp/
m
a
int-1
.
6
.
5-fast-import-
n
on-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
am
a
no
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge
b
ranch 'pc/uninteresting-submodul
e
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'nd/includ
e
-termios-for-
o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
M
e
r
ge
branch 'jm/main
t
-1
.
6
.
5-grep-NU
L
-termin
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
sy
m
l
i
nks
.
c: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C Hamano
object
.
c: remove unused
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Do
c
um
e
nt
t
h
a
t me
r
ge st
r
a
t
egies can now take
their
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
Make "
s
u
b
tree" part more
o
rthogonal to
t
h
e
rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hama
n
o
pull:
Fix parsi
n
g of -X<option
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Ham
a
n
o
Update draft release
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
mano
Merge b
r
anch
'
tc/t
e
st-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Mer
g
e bra
n
ch 'jh/commit-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge branch 'jn/mak
e
file'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge bra
n
ch 'jc/maint-1
.
6
.
1-checkout-m-
c
ustom-me
r
ge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge branch 'tc/clone
-
v-progress'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C H
a
m
ano
Me
r
ge branch 'tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merg
e
branch 'jk/run-comma
n
d-us
e
-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Mer
g
e bra
n
c
h
'
sr/
g
fi-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
U
p
date COPYING with GPLv2 with new F
S
F address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
s
er_ident_
s
uf
f
iciently_give
n
(): re
f
a
ctor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
user_id
e
nt
_
suffici
e
ntly_giv
e
n(
)
: ref
a
ctor
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
re
r
ere: honor con
f
lict-marker-
s
ize attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prep
a
r
e
for customizable conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
c
o
mmit
.
c::print_su
m
mary: do not release the for
m
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Haman
o
conflict-marker-s
i
ze: new attribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere: use ll_merge() i
n
stead of u
s
in
g
xdl_merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
merge
-
t
r
e
e
: use l
l
_merge() not xd
l
_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
dl_mer
g
e()
:
allow pass
i
ng down marker_size in
xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
x
dl_m
e
rge(): introduce xmparam_t for mer
g
e
s
p
e
c
i
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
g
i
t
_attr(): f
i
x function signatu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
M
erge branch 'cc/reset-mor
e
'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ham
a
no
grep -
-
no-index
:
a
l
low use of "git g
r
ep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: pre
p
ar
e
t
o run
outside of a
w
ork t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
Merge branch
'jc/checkout-merge-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C Hamano
Mer
g
e branch 'rs
/
m
a
int-
a
rchive-matc
h
-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
Ham
a
no
Merge branch 'il/vcs-h
e
lper'
commit
|
commitdiff
|
tree
next