repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2011-05-21
Junio C Hamano
Merge bran
c
h '
m
ai
n
t'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
n
o
U
pdate dra
f
t release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merg
e
branch 'jc/m
a
int-1
.
7
.
4-path
s
pec-std
i
n-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bra
n
ch 'rg/copy-ge
c
os
-
u
se
r
name'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C
H
am
a
no
Merge bra
n
c
h
'jl/submo
d
ule-conf
l
icted-gitmodule
s
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Mer
g
e branc
h
'jc/
r
eplacing'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'nd/sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C Hamano
Merge branch
'ld/p4-preserve-user
-
name
s
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
er
g
e br
a
nc
h
'ms/tagname-does-not-begin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
a
m
a
no
Merge branch 'jk/git-co
n
nection-dea
d
lo
c
k-
f
i
x'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
a
n
o
Merg
e
branch 'js/maint
-
s
end
-
pac
k
-statele
s
s-
r
pc-deadloc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Hamano
Merge b
r
an
c
h 'j
k
/
ch
e
rry-pick-root-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
i
o
C Ha
m
ano
Merge br
a
nch 'jc/maint-pathsp
e
c-stdin-and-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-20
J
unio
C
Ham
a
no
Merg
e
1
.
7
.
5
.
2
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
i
o C
H
aman
o
Revert "Me
r
ge branch 'en/merg
e
-rec
u
rsive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
H
amano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
io C
Hama
n
o
Updat
e
release note
s
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
M
e
r
g
e bran
c
h 'js/maint-1
.
6
.
6-
s
end-pack-stateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch 'jc/co
n
vert'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
Ha
m
ano
Merge br
a
n
ch
'
c
i
/commit--in
t
eractive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch '
s
g
/completion-updat
e
s'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Mer
g
e branch 'kk/maint-p
r
efix
-
i
n-confi
g
-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge b
r
anch 'mg/
m
erge-ff-
c
onfig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Ham
a
no
Update draft release
n
otes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hama
n
o
Merge branch 'jn/maint-
f
o
r
mat-patch-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
e
rge branch
'ss
/
c
h
e
rry-pick-x-
d
oc'
into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge
b
ranch 'vr/mer
g
e-base-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch
'
sr/
m
aint-f
a
s
t-
i
m
p
o
r
t-tigh
t
en-o
p
t
ion-p
a
rsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
Merge branch 'jc
/
t1506
-
s
he
l
l
-param-expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge branch
'jc/fix-add-u-unme
r
ged' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ha
m
a
n
o
Merge
branch 'jn/gitweb-d
e
p
e
nde
n
cy' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
ano
M
e
rge branch
'
jc/maint-branch-mergeoptions' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jc/ma
i
nt-add-p-overlapping-
h
unks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_demu
x
()
:
fix decl-a
f
ter-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Sync release no
t
e
s for 1
.
7
.
6 to exclude what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
U
pdate dr
a
ft release notes
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge bra
n
ch
'cn/format-
p
atch-
q
uiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge br
a
n
c
h 'jm
/
mergetool-su
b
module
s
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge branch 'jk/form
a
t
-patch
-
quote-special
-
in-
f
ro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch
'
v
h
/g
i
t-s
v
n-doc
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_op
e
n_noatime():
d
rop
unused parame
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
sha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
Hamano
read_sh
a
1
_f
i
le(): allow selec
t
ive bypassing
o
f
r
eplacement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C
Haman
o
inline lookup_repl
a
ce_object() c
a
l
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
rea
d
_
s
h
a1_
f
ile(
)
: get ri
d
of r
e
ad_sha1_file_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
t60
5
0: make sure we t
e
st not just commit
r
eplaceme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Decla
r
e lo
o
kup
_
repl
a
ce
_
object() in cache
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge b
r
an
c
h 'maint
'
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Update draft
r
elease notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
bra
n
ch 'bf/com
m
i
t
-template-no
-
cleanup'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C Hamano
M
erge bran
c
h 'jc/t1506-she
l
l-par
a
m-ex
p
ansion
-
gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'rr/r
e
r
e
r
e-libify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hama
n
o
Merge branch '
j
s/
m
aint-se
n
d
-pack-
s
tateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
am
a
no
Merge b
r
anch 'jh/dirstat-li
n
es'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C H
a
mano
Merge branch 'j
n
/setup-revisions-glob-and-friends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
Merge
branch 'cn/log
-
p
arse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
ano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
ama
n
o
Prepare
f
or
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
r
a
n
ch 'aw/m
a
int-rebase
-
i-p-n
o
-ff
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
M
e
rg
e
br
a
nc
h
'
j
s
/blame-parsename' into main
t
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
m
an
o
Me
r
g
e branch 'gr/cv
s
import-al
t
er
n
ative-cvspa
s
s-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'cj/
p
4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch 'jk/m
e
rge-one-
f
i
l
e-working
-
tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge b
r
anc
h
'
j
c
/
f
ix
-
diff-files-un
m
erged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
Hamano
Merge branch
'mz/maint-rename-unmerged'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
Merge
b
ranc
h
'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io C Hamano
Merge branch '
j
c
/maint-1
.
7
.
4-pathspec-std
i
n
-
a
nd-c
m
dline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge bran
c
h 'jc/maint-1
.
6
.
6
-
p
at
h
sp
e
c-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
Merge br
a
nch 'jc/maint-1
.
6
.
6-pat
h
spec-stdin-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
s
etup_revisio
n
s(): take pathsp
e
c from com
m
an
d
l
ine
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Update dra
f
t
r
ele
a
se no
t
es
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Me
r
ge branch '
j
n/gitweb-depe
n
dency'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge br
a
nch 'jc/maint-br
a
nch-
m
ergeoptio
n
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hama
n
o
Merge branch
'
j
n
/m
a
i
n
t-test-me
r
ge
-
verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch 'vh/config
-
i
n
t
e
ractive-singl
e
key-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
uni
o
C
H
amano
Merge branch 'jc/
m
aint-add-p-overlappin
g
-hunks
'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merge branch 'sr
/
maint-f
a
st-import
-
tight
e
n-option-par
s
in
g
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'dm/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C
Hamano
Me
r
ge
b
ran
c
h '
j
n/ctags'
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
M
erge b
r
anc
h
'
f
c
/
completion-
z
sh' into sg/c
o
mpleti
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Haman
o
Revert "complet
i
on: don'
t
declare
'local words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
amano
Rev
e
rt "
H
on
o
r $(
p
refix) set
i
n conf
i
g
.
mak
*
when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
a
mano
c
o
nvert:
m
ake it
harder t
o
screw up adding a c
o
n
v
e
rs
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
c
o
nvert: make
it safer to add c
o
nver
s
ion attribu
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: give s
a
ner
n
ames to
crlf/
e
ol var
i
ab
l
es, typ
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: rename t
h
e "eol"
g
lo
b
al variable to
"
core
_
e
ol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
ano
t1
5
07:
a
void
"${pa
r
ameter<op>'word'}" i
n
s
i
de
double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ham
a
no
t3701:
a
dd
-
p-fi
x
makes the la
s
t test to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
r
erere: l
i
bify rerere_clear() and rer
e
re_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Haman
o
merge: introduce m
e
rge
.
ff configurati
o
n va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Me
r
ge b
r
anch 'jc/maint
-
branc
h
-merge
o
ptions' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
merge: ma
k
e
branch
.
<na
m
e>
.
mergeo
p
ti
o
ns correctly overrid
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Update draft
r
e
l
ease notes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Ha
m
an
o
Merge b
r
anch 'jn/run-command-err
o
r
-failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch
'
js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merg
e
branch 'im/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
H
a
mano
Merge b
r
anch '
j
k/mer
g
e-one-file-w
o
r
king-tr
e
e'
commit
|
commitdiff
|
tree
next