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 'jk/blame-line-porcelain'
2011-05-23
Junio
C Hamano
Merg
e
branch 'jk/blame
-
l
i
ne-porcel
a
i
n
'
commit
|
commitdiff
|
tree
2011-05-21
Junio
C
Ha
m
ano
Me
r
ge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Upda
t
e d
r
aft releas
e
notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio
C Hamano
M
e
rge branch 'jc/maint-1
.
7
.
4-pat
h
s
p
ec-stdin
-
and-cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-20
J
un
i
o
C
H
ama
n
o
Merge branch 'rg/cop
y
-g
e
cos-username'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Ha
m
ano
Merg
e
br
a
nch 'jl/s
u
bm
o
dule-conflict
e
d-gitmod
u
les'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
erge branch 'jc/re
p
laci
n
g'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bran
c
h
'nd/sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C H
a
m
a
no
Merge
b
ranch 'ld/p4-p
r
eserve-us
e
r-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Ham
a
no
M
e
rge
b
ranch 'ms/tagna
m
e
-does-no
t
-begin-wit
h
-
d
ash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Merge branch 'jk/git-
c
on
n
e
c
t
ion
-
d
e
adloc
k
-fix
'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Haman
o
Merge branch
'js/maint-se
n
d-pack
-
stateless-r
p
c-d
e
adl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Mer
g
e b
r
anc
h
'jk/
c
herry-pick-r
o
ot-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Haman
o
Merge
b
ranch 'j
c
/maint
-
pat
h
spec-st
d
in-and-cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge 1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C
Hamano
Revert "Merge branch 'en/merge-recursive'
"
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Ha
m
a
n
o
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
io C Hamano
Update
release not
e
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
unio
C Haman
o
Mer
g
e branch 'j
s
/maint-1
.
6
.
6-send-
p
ack-statel
e
s
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
mano
Merge branch '
j
c/c
o
nvert'
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
Hama
n
o
Merge branch 'ci/commit--interact
i
ve-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge
br
a
nch
'sg/comp
l
etion-up
d
ates'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'kk/m
a
int-prefix-i
n
-c
o
nfig-mak'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C H
a
m
a
no
Merge branch
'mg/merge
-
ff
-
c
o
nfig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Up
d
at
e
draft re
l
ease
n
otes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
a
no
Mer
g
e b
r
anch 'jn
/
m
a
int-format-patch-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
erge branch 'ss/cherry-pick-
x
-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge bra
n
ch 'vr
/
merge-base
-
doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Mer
g
e branch 'sr/maint-fast-import-tighten
-
opt
i
on-parsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge bra
n
ch 'jc/t
1
50
6
-
s
hell-p
a
ram-ex
p
ansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/f
i
x-add-u-un
m
erged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o
C
H
amano
Merge bran
c
h
'j
n
/gitweb-depe
n
dency'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
Hamano
Merge branch 'jc
/
mai
n
t-branch-mergeoption
s
' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C
Hamano
Merge bran
c
h 'jc/
m
aint-add-p-overlapping-hun
k
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
sideband_demux
(
): fi
x
dec
l
-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Sync release notes for 1
.
7
.
6 to
exc
l
ud
e
what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Merge branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Haman
o
Update dra
f
t r
e
l
ease note
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
no
Me
r
ge branch 'cn/forma
t
-patch-quiet' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
n
o
Merge branc
h
'jm/merg
e
t
o
o
l
-submodules' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C
Hamano
Merge branc
h
'jk/form
a
t-patch-quote-spe
c
ial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C Ha
m
ano
Merge
bran
c
h 'vh/git-s
v
n-doc
'
into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hama
n
o
git_open_noa
t
i
me(): drop unused para
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
sha1
_
f
i
l
e: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
Haman
o
read_sha1
_
file(
)
:
a
llow selecti
v
e by
p
a
s
s
ing
o
f replacem
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
inline lookup_replace_object() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ha
m
ano
read_
s
ha1
_
file():
get rid
of rea
d
_sha1_file_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
t
6050
:
make sure we te
s
t
not just commit replace
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Declare lookup_replac
e
_obj
e
ct()
in cache
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
uni
o
C H
a
mano
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Hamano
Update draft release notes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge
branch '
b
f/comm
i
t-template-no-clea
n
up'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/t1506
-
shell-para
m
-
expansion
-
gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
ama
n
o
Merge branch 'rr/rerere-li
b
ify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
br
a
nch 'js/maint-send
-
pa
c
k-stateless-rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
M
e
rge branch 'j
h
/dirstat-line
s
'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Haman
o
Merge
b
ran
c
h
'jc/fi
x
-add-u-unm
e
rg
e
d
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C Hama
n
o
Merge branch 'jn/setup-revisions-glob-and-frien
d
s-p
a
ssthru'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Haman
o
Merg
e
branch 'cn/log-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Ham
a
n
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
erge branch 'aw/maint-rebase-i
-
p-no-ff' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
M
e
rge br
a
nch 'js/blame-parsename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch 'gr/c
v
simport-a
l
t
er
n
a
tive-cvspass-lo
c
a
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch '
c
j/p4mer
g
e
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
Merge branch '
j
k/merg
e
-one
-
fi
l
e
-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bran
c
h 'jc/fix-diff-files-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C Hamano
M
erge branch '
m
z/main
t
-rename-unmerge
d
' into
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bran
c
h 'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
b
r
anc
h
'jc/maint-1
.
7
.
4-paths
p
ec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
a
mano
Merge branch
'jc/maint-
1
.
6
.
6-pathspec-stdin-and-cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
M
erge branch 'jc
/
ma
i
nt-1
.
6
.
6
-
paths
p
ec-stdin-and-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C H
a
mano
setup_revisions(): take pathspec fro
m
c
ommand line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hama
n
o
Update draft release notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jn/gitweb-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C
H
amano
Mer
g
e
b
ranch 'jc
/
maint-branch-mergeoption
s
'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge b
r
anch
'jn/main
t
-test
-
me
r
ge
-
verify
-
parents'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge branch 'vh/config
-
inte
r
activ
e
-singleke
y
-doc'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge branch 'jc/maint
-
add
-
p-overlapping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
rge branch 'sr/ma
i
nt-
f
a
st-
i
mport-tighten-o
p
tio
n
-parsin
g
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'dm/ht
t
p-cl
e
an
u
p'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jn/ctags
'
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Hamano
Merge b
r
anch '
f
c
/
comple
t
ion
-
zsh
'
i
n
to s
g
/comp
l
e
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
J
u
nio C Hama
n
o
R
evert
"
c
om
p
letio
n
: don't d
e
clare 'local
words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Haman
o
Revert "Hono
r
$(pre
f
i
x) s
e
t in config
.
mak* wh
e
n defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert
:
m
ake it
harde
r
t
o
screw up adding a
conversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
an
o
co
n
vert
:
make i
t
saf
e
r
to
a
d
d conversion attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C Hamano
conve
r
t:
gi
v
e
s
an
e
r names to
crlf/eol variable
s
,
types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C Hamano
co
n
vert: rename
t
he
"
e
ol" global variable to
"core
_
e
ol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
n
io C Hamano
t1507: avoid "${parame
t
er<op>'word'}"
i
nside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio
C
H
a
m
a
n
o
t3701
:
add-p-f
i
x mak
e
s the last
t
es
t
to p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
ma
n
o
rerere:
libify rerere_clear() and rerere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
merge: introduce merge
.
ff conf
i
g
u
ra
t
i
o
n
va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
Hama
n
o
Merge branch
'
jc/ma
i
nt-b
r
anch-mergeoptions
'
int
o
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
merge: make branch
.
<nam
e
>
.
mergeoptions
c
orrec
t
ly ove
r
ride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Updat
e
draft rel
e
ase n
o
t
e
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hama
n
o
Merge branch 'jn/run-c
o
mma
n
d-er
r
or
-
fail
u
r
e
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C H
a
mano
Merge
branch '
j
s/info-man
-
path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
branch 'im/hash
c
mp-optim'
commit
|
commitdiff
|
tree
next