repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.0.4
2010-01-20
Juni
o
C Hamano
Merge br
a
nch
'
jc/ls-files-igno
r
ed-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Mer
g
e
b
r
anch
'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/maint-strbuf-add-fix-d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Merge branc
h
'mm/c
o
nfli
c
t
-
a
dvice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Mer
g
e
branch
'da/d
i
fftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge br
a
nch '
m
h/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge
bran
c
h
'ns
/
reb
a
se-auto-
s
quas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge
b
ranch 'mh/reba
s
e-fixup' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'il
/
pu
s
h-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C H
a
m
ano
M
e
rge b
r
anch 'jk/warn-author-
c
ommitter-aft
e
r-
c
ommit'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge bran
c
h 'tr/http-push-ref-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
an
o
Me
r
ge branch 'bk/f
i
x-r
e
lative
-
gitdir-file
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge branch 'sd/cd-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e branch 'jc/symbol-sta
t
ic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
dat
e
.
c: m
a
r
k
file-lo
c
al funct
i
on
s
tatic
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
Juni
o
C Haman
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erg
e
branch '
b
g
/
maint-r
e
m
ote
-
update-de
f
ault' 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
Merg
e
branch 'bg/maint-add-all-doc' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Ham
a
no
Me
r
g
e
bra
n
ch 'maint-1
.
6
.
5' i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
G
it 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Me
r
ge branch 'jk/mai
n
t-1
.
6
.
5-reset-
h
ard' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
an
o
Merge branch
'
tr/maint-1
.
6
.
5-bash-pr
o
mpt-sh
o
w-sub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Mer
g
e
branch 'dp/maint-1
.
6
.
5-fast-impo
r
t-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branc
h
'
jm/maint
-
1
.
6
.
5-grep-
N
UL-
t
erminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
a
m
a
no
Teach
@{upstream} s
y
ntax to strbuf_branchanme
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
t15
0
6
:
more test for @
{
up
s
tream}
s
y
ntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Ha
m
ano
Fix "checko
u
t A
.
.
.
" synon
y
m for "checkout A
.
.
.
H
E
AD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't r
e
quire the repo
s
itory
t
o be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
r
anch '
m
aint-1
.
6
.
4
'
int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge bra
n
c
h
'maint
-
1
.
6
.
3' int
o
main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge branch
'
maint-1
.
6
.
2' into m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e
commit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Fix mis-ba
c
kport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Update 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
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ham
a
n
o
Update draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge
branch 'd
p
/maint-1
.
6
.
5
-
fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
b
ranch 'jc/re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge br
a
nch 'pc
/
uninteresting-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Mer
g
e branch
'nd/
i
nclude-t
e
rmios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C Ha
m
ano
Merge
b
ran
c
h 'js/w
i
ndows'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge br
a
nch 'jm
/
mai
n
t-1
.
6
.
5-grep-NUL-term
i
nate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
amano
symlinks
.
c: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
object
.
c: remove unuse
d
functions
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 take
t
h
eir
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
Mak
e
"sub
t
ree" part mo
r
e
ort
h
ogonal to
the rest
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
pull: Fix parsi
n
g of
-
X
<opti
o
n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Up
d
a
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 'tc
/
t
e
s
t
-l
o
cate-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
r
ge branch 'j
h
/commit-stat
u
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge bran
c
h 'jn/makefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Mer
g
e branch 'j
c
/main
t
-1
.
6
.
1-chec
k
out-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
Merge
b
ra
n
ch 't
c
/
c
lone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge
branch
'tc/smart-http-
r
estrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
j
k/r
u
n-command-use-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Hamano
Merge br
a
n
c
h
'sr/gfi-
o
pti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Update COPYING
w
i
th GPLv2 with
n
ew FS
F
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_sufficiently
_
giv
e
n(): refac
t
or the l
o
gi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
ano
user_iden
t
_sufficiently_
g
iven():
refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
aman
o
re
r
ere: hon
o
r confl
i
ct-marker
-
siz
e
attribu
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
re
r
ere: pre
p
a
r
e
for
customizable conflict m
a
rker lengt
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
commit
.
c
::print_summa
r
y: do not release the for
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
conflict-
m
a
rker-size:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
r
e
rere
:
u
s
e
ll
_
merge()
instea
d
of usi
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
merge-tree: use ll_merge(
)
not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
x
d
l_merge(): allow passin
g
down ma
r
ker
_
size in xmpar
a
m_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_mer
g
e
(
):
i
n
t
roduce xmparam_t for me
r
ge
s
pecific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hama
n
o
git_attr(): fix
function signa
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'cc
/
reset-m
o
r
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Te
a
ch diff that m
o
d
i
fied submo
d
ule directory is di
r
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
a
m
a
no
gr
e
p --no-in
d
ex:
allow use of "
g
it grep"
outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
u
ni
o
C
H
amano
grep: pr
e
pare to run outsi
d
e of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/checkout-m
e
r
g
e-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Merge branch
'rs/m
a
int
-
archi
v
e-m
a
tch-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
Me
r
ge b
r
an
c
h 'il/
v
c
s
-helpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
strbuf_addbuf()
:
allow pass
i
ng
t
he
s
a
m
e buf
t
o d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
Merge b
r
anch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
e
rge branch 'nd/
s
parse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502: test
commit
.
st
a
tus, -
-
status and
-
-n
o
-s
t
atus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Ham
a
no
grep: rip
o
u
t
p
essimization t
o
use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io
C
Hamano
grep:
rip out support for e
x
ter
n
a
l
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io
C
H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
strbuf
.
c: remove unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Ham
a
n
o
sha
1
_fil
e
.
c: remove
unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
m
a
i
l
map
.
c:
r
em
o
ve unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
utf8
.
c
:
mar
k
file-lo
c
al function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
H
amano
submodule
.
c
: mark file-local
f
unction
sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
quote
.
c: mar
k
f
ile
-
local funct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C H
a
mano
remote-curl
.
c: mark
f
ile-local function st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
r
ead-cach
e
.
c
:
mar
k
f
i
l
e-local functions stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
pars
e
-
options
.
c:
ma
r
k file-local fu
n
ction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
e
n
try
.
c: mark file-local fun
c
tion sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
h
ttp
.
c: mark file-local fu
n
ct
i
ons s
t
ati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge branch 'jc/maint-
1
.
6
.
4-
g
r
e
p
-l
o
okahead'
into jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
g
r
e
p: optimiz
e
b
u
ilt
-
in g
r
ep b
y
s
k
ipping li
n
es that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next