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
Merge branch 'mg/mailmap-update' into maint
2010-01-20
Junio C H
a
m
ano
Merge branch 'jc/c
a
che-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ham
a
no
Merge branch 'js/exec-error-report
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge bra
n
c
h 'jc/ls-files-igno
r
ed-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
am
a
no
Merge branch 'jc/g
r
ep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Hamano
Merge b
r
anch 'jc/m
a
int-strbuf-a
d
d-fix
-
doubling'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
M
erge branc
h
'mm/confli
c
t-
a
dvi
c
e'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Me
r
g
e
branc
h
'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Merge b
r
a
n
ch
'
n
s
/
r
e
b
ase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge
branch 'mh/rebase-f
i
x
up'
(
early part)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Merge branch 'i
l
/push-set
-
u
p
str
e
am'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Merge
b
r
a
nch 'jk/warn-author-committ
e
r-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merge branch 'jc
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branc
h
'tr/htt
p
-pu
s
h-r
e
f-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge
b
r
anch 'bk/fix-relative
-
g
itdir-file
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'sd/cd
-
p-s
h
o
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'j
c
/sym
b
ol-sta
t
i
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
date
.
c
:
mark file-local funct
i
on
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
G
i
t 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bg/maint-re
m
o
t
e-
u
pd
a
te-d
e
fault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branch 'sb/maint-octopus' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Merg
e
bra
n
ch 'bg/maint-add-all-d
o
c' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'm
a
i
nt-1
.
6
.
5
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
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
Hamano
M
er
g
e branch 'jk/m
a
in
t
-
1
.
6
.
5-rese
t
-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Me
r
ge branch 'tr/mai
n
t-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge b
r
anch 'dp/main
t
-1
.
6
.
5-fast-i
m
port-n
o
n
-
c
ommi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge bra
n
ch 'jm
/
main
t
-1
.
6
.
5-grep-NU
L
-termin
a
te
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Teach
@
{
u
pstream} sy
n
tax t
o
s
tr
b
u
f_
b
r
a
nchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Hamano
t15
0
6: mo
r
e t
e
st
for
@{upst
r
e
a
m}
sy
n
tax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Fix
"
chec
k
out A
.
.
.
"
s
ynon
y
m for
"
c
hecko
u
t A
.
.
.
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Haman
o
s
tatu
s
:
d
on't r
e
qui
r
e the repository to be w
r
itable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o
C
Hamano
Merge branch 'maint-1
.
6
.
4
' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bran
c
h 'ma
i
nt-1
.
6
.
3
'
into ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ham
a
no
Mer
g
e branch 'maint-1
.
6
.
2' into maint-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge commit
'
v1
.
6
.
4
.
4
-
8-g8de6518
'
i
nt
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-backp
o
r
t
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
U
p
date draft releas
e
notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge
branch
'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Update draft release not
e
s to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ra
n
ch 'dp/mai
n
t-1
.
6
.
5-
f
ast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ha
m
ano
M
e
rg
e
branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
c
h
'pc/uninteres
t
ing-submod
u
l
e
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
M
e
r
ge bran
c
h
'
nd/inc
l
ude
-
termios-
f
or-osol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C H
a
m
ano
M
e
rge br
a
nch 'js/wind
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
M
erge branc
h
'jm
/
mai
n
t-1
.
6
.
5-gr
e
p-N
U
L-terminate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
symlinks
.
c: remove
u
nused functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C H
a
mano
object
.
c: remove unused
f
un
c
tio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Document that merge str
a
tegies
can now take t
h
eir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtree
"
p
art mo
r
e ort
h
ogonal
t
o the
r
est of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: F
i
x parsing of -X<
o
pt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o
C H
a
mano
Updat
e
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
m
ano
Me
r
ge bran
c
h 't
c
/tes
t
-
locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Haman
o
M
e
r
ge branch 'jh/c
o
mmit-s
t
atu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
Merge
bran
c
h 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge bra
n
ch 'jc/main
t
-
1
.
6
.
1
-
checkout-m-
c
usto
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Merg
e
branch 'tc/clone-v-p
r
o
g
re
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e bra
n
ch 'tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
ama
n
o
Merge b
r
a
nch 'jk/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
M
erg
e
branch 'sr/gfi-op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Update
COPYING wi
t
h
G
P
Lv2
with new F
S
F
a
ddre
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
user_ident_su
f
f
i
ciently_
g
iven()
:
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
user_id
e
nt_suffi
c
iently_given(): refactor th
e
lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re: honor con
f
lict-
m
arker-si
z
e attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
re
r
ere: p
r
epare for cust
o
mizable c
o
nflict
m
a
rker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
comm
i
t
.
c::print_summa
r
y: do
not r
e
l
ea
s
e
the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
conflict-marker-siz
e
:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Ha
m
ano
rerere: us
e
ll
_
merge() instead of using xdl_merg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
m
erg
e
-tree: u
s
e ll_me
r
ge() not
x
dl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_me
r
g
e(): a
l
low p
a
s
sing down marker_s
i
ze in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
x
d
l
_merge(): introduce
x
mparam_t
f
or m
e
r
g
e
specifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
g
i
t_attr(): fix function sig
n
ature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
aman
o
Merg
e
bra
n
ch 'cc/reset
-
more'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
an
o
Te
a
ch d
i
ff that
modifi
e
d
s
u
b
m
odule
d
i
r
e
ctory is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io C
H
a
mano
grep --no-index:
allow use of "git grep" ou
t
side a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
a
mano
g
r
e
p: pre
p
are to run outside o
f
a
wor
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Haman
o
Merg
e
bran
c
h 'jc/check
o
u
t
-
m
erge-base'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
Mer
g
e branch 'r
s
/mai
n
t-
a
rchive-match-
p
athspec
'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io
C Hamano
M
e
rge branch 'il/vcs-he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
str
b
uf_addbuf(): allow
passing the same buf to
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
Merge
b
ranch 'c
c
/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hama
n
o
Merge
branc
h
'n
d
/sparse
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502
:
test commit
.
status, --status and --no-stat
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Ha
m
ano
grep: rip ou
t
pessimiz
a
ti
o
n to
use fixma
t
ch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
grep
:
rip out
sup
p
o
r
t for external
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
H
amano
strb
u
f
.
c
:
remove unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
sha
1
_file
.
c:
r
emov
e
un
u
s
e
d functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
m
ailmap
.
c: remove
unused
f
unction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
utf8
.
c: mark fi
l
e
-
local
funct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
s
ubm
o
d
ule
.
c: mark f
i
le-l
o
cal
f
u
nc
t
ion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
quote
.
c: mark fi
l
e-l
o
cal function s
t
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o C Haman
o
re
m
ote-cu
r
l
.
c
:
m
a
rk fil
e
-local
f
unction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
read-cache
.
c:
mark fil
e
-local f
u
nctions s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
i
o
C Hamano
pa
r
se-options
.
c: mark file-
l
o
ca
l
function s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
entry
.
c: m
a
rk file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hamano
htt
p
.
c
:
mar
k
file-local f
u
ncti
o
ns
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next