repo.or.cz
/
git
/
kusma.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
M
e
r
g
e
br
a
nch 'nd/ls-files-
s
parse-f
i
x'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
git-mv: fix
m
oving more than o
n
e source to a si
n
gle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio
C Hamano
merge-
r
ecursive: do
not retur
n
NULL o
n
ly to cause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
c
o
nflict-marker-siz
e
:
a
d
d test
a
nd docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Upda
t
e draft release notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge
b
ranch
'bw/
c
v
simport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
n
o
Mer
g
e bra
n
ch 'jc/c
h
eckout-me
r
g
e
-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C H
a
mano
Merge branc
h
'a
g
/
patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
anch 'j
c
/conflict-ma
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Ha
m
ano
Merge branch 'ag/ma
i
nt-ap
p
ly-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Ham
a
no
M
e
rge branch
'a
p
/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch 'nd/status-partial
-
refresh'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o C H
a
mano
Merge
r
emote b
r
anch 're
m
otes
/
trast-doc/for-
n
ex
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
no
Merge
b
ra
n
ch
'jh/
n
otes' (ea
r
ly
p
a
rt)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch 'jc/
m
a
i
nt-r
e
fresh-index-
i
s
-
optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Merge branch 'rr/core
-
t
u
torial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
bran
c
h
'jc/cac
h
e-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e bra
n
c
h
'js/exec-error-r
e
port'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Merge
branch '
j
c/l
s
-
f
iles-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge br
a
nc
h
'jc/
g
rep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge b
r
anch
'
jc
/
m
aint-str
b
uf-add-fix-doubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
m
a
no
Merg
e
branch 'm
m
/con
f
lict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranc
h
'da
/
dif
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge bran
c
h
'
m
h/re
b
ase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge branch 'ns/rebase
-
a
uto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
Me
r
ge branch 'mh/rebase-fi
x
up' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'il/pu
s
h-se
t
-u
p
stream'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
r
g
e
branch 'jk/warn-author-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
er
g
e br
a
n
ch 'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merg
e
branch 'tr/h
t
tp
-
push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Merge branch 'bk/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge b
r
anch
'
sd/cd-p-show-
t
opleve
l
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Me
r
g
e
branch 'jc
/
s
ymbol-s
t
atic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
date
.
c:
mark file-local fu
n
ction s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Sync with
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e branch 'bg/maint
-
r
emot
e
-
u
pdate-
d
efault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge b
r
anch 'sb/maint-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Me
r
ge branch
'bg
/
m
ai
n
t-add-all
-
doc' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch
'maint-1
.
6
.
5
' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
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
'jk
/
m
aint-1
.
6
.
5-reset-
h
ar
d
' int
o
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge branc
h
'
tr/maint-1
.
6
.
5-bash-promp
t
-show-submodul
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
m
a
n
o
Merge branch 'dp/m
a
int-1
.
6
.
5-fas
t
-
imp
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge
b
ranch 'jm
/
maint-1
.
6
.
5-gr
e
p
-
N
U
L
-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
F
ix
"chec
k
out
A
.
.
.
" synonym for
"ch
e
c
k
out A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
status: don't req
u
ire the repo
s
itory to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch
'maint-1
.
6
.
4' int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Merge bra
n
ch 'mai
n
t
-
1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Hamano
M
e
rge branch 'mai
n
t-1
.
6
.
2' into maint-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8-
g
8de6518' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Ham
a
no
F
i
x mis-backp
o
rt of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update dra
f
t release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Update dra
f
t releas
e
notes
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge bra
n
ch
'dp/m
a
int
-
1
.
6
.
5-fast-import
-
non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
br
a
n
ch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
a
nch 'pc/uninterest
i
ng-subm
o
dule-disappea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'nd/
i
nc
l
ude-termio
s
-for-
o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch
'
j
s/windows'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'jm/m
a
int
-
1
.
6
.
5
-grep-
N
UL
-
terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
sy
m
lin
k
s
.
c: remove unused fu
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
object
.
c
:
remove unu
s
ed functi
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Do
c
ument t
h
at merge strategies can now take t
h
e
i
r
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Ma
k
e "subtree"
part mor
e
ort
h
o
g
o
nal to the res
t
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
pu
l
l: Fix parsing of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Ha
m
a
n
o
Update
d
r
af
t
rel
e
as
e
note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merge br
a
nch 'tc/
t
es
t
-l
o
cat
e
-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
amano
M
e
rge
bra
n
ch 'jh/commi
t
-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge bran
c
h 'jn/makef
i
l
e
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
Merge branch 'jc/mai
n
t-1
.
6
.
1-c
h
e
c
k
o
u
t
-m-custom-
m
erge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
M
er
g
e branch 'tc/clone-v-p
r
o
gres
s
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
rge bran
c
h
'tc/s
m
a
r
t
-http-r
e
strict'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Hamano
M
e
rge
branch 'jk/r
u
n-c
o
m
mand-use-shell
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'sr
/
gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
mano
Update COPY
I
NG with GP
L
v2 with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_
i
d
ent_suf
f
ici
e
ntly_given(): r
e
factor the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
s
e
r
_ident_s
u
fficientl
y
_given(
)
: ref
a
ctor
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
rere:
h
onor c
o
nfl
i
ct-
m
a
r
ker-
s
iz
e
attribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere: pre
p
are for
cu
s
tomizab
l
e conflict mark
e
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::prin
t
_summary:
d
o not relea
s
e
the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C
H
a
m
ano
conflict
-
m
a
rker-size: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
rer
e
re: use ll_
m
erge()
i
nstead
of u
s
ing xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Ha
m
ano
merge-
t
ree: use ll
_
mer
g
e() not xdl_
m
er
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
xdl_merge(
)
: al
l
o
w
pa
s
sing
down marker
_
size in xmpa
r
a
m_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C
H
amano
x
d
l_mer
g
e
(
): introd
u
ce xm
p
aram_t for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
git_attr():
fix
f
uncti
o
n signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-15
J
u
nio C Ha
m
a
no
grep --no-index:
a
llow use of
"
git
grep
"
o
utside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: p
r
ep
a
re to run
outside of a work
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Merge branch '
j
c/check
o
ut-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
M
erge branch 'rs/m
a
i
n
t
-archive-match-pathspec
'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
M
e
r
ge branch
'
il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
m
a
no
strbuf_addbuf(): allow passing
t
he s
a
me buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Me
r
g
e b
r
anch
'cc/
r
e
set-more'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio
C
Hamano
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
next