repo.or.cz
/
git
/
mjg.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-1.7.4' into maint
2011-05-26
Jun
i
o C Ha
m
ano
M
erge branch
'
m
ain
t
-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Haman
o
Merge
branch 'j
k
/git-conne
c
tion-deadlock-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch
'js/mai
n
t-sen
d
-pack-stateless-rpc-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch '
j
k/maint-upl
o
a
d
-pack-shall
o
w' into
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
H
a
m
ano
M
e
rge branch 'jm/maint-diff-words-with-sbe' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge b
r
anch 'kk/maint
-
pr
e
fix-in-c
o
nfig-m
a
k' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
mano
Merge b
r
anch 'mg/diff-uiconfig-d
o
c' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Mer
g
e branch 'ft/gitwe
b
-tar-with-gzip-n' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'ss/
d
oc-svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
a
n
o
Merge branch 'jn/format-
p
atch-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
m
ano
Mer
g
e branch 'jc/maint-pathspec-stdin-an
d
-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
M
erge
b
ra
n
ch
'
j
k/cherry-pi
c
k-roo
t
-with-r
e
s
olve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Me
r
ge
branc
h
'rg/copy-gec
o
s-
u
ser
n
ame' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
Hamano
Mer
g
e branch 'fc
/
comp
l
eti
o
n-zsh' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'jk/git-connection-dead
l
ock-f
i
x'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge br
a
n
ch 'js/maint-
s
e
n
d-pac
k
-stat
e
l
es
s
-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
M
e
rge
branch 'svn-fe-maint' of git:/
/
repo
.
or
.
cz/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen
Tha
i
Ngoc Duy
init
/
clone:
r
emove shor
t
option -L and d
o
cumen
t
-
-
s
ep
a
r
a
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
i
m
Meye
r
ing
do not read beyon
d
end of malloc'd
bu
f
fer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mic
h
ael J Gruber
g
i
t
-
svn: Fix git
s
v
n log --show
-
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
o
n
atha
n
Nieder
provide
a
c
opy o
f
the LGP
L
v2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
tes
t
core
.
gitpr
o
x
y
con
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Raf
a
e
l
G
i
e
sc
h
k
e
cop
y
_gecos: fix not adding nlen to len whe
n
p
rocessing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
ni
o
C Hama
n
o
Mer
g
e branch 'js/maint-
1
.
6
.
6-send-pack-sta
t
el
e
s
s-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Update draft release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
erge branch 'jn/maint
-
form
a
t
-
patch-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'ss/ch
e
rry-p
i
ck
-
x-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Me
r
ge bra
n
ch 'v
r
/merg
e
-base-d
o
c' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
amano
Merge branch 's
r
/
mai
n
t
-
fast-impor
t
-tighten-opt
i
on
-
p
a
rsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
branch 'j
c
/t
1
5
0
6-shell-param-
e
xpansion
-
g
ot
c
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge bra
n
ch
'
jc
/
fix-add-u-unmerged' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branc
h
'
j
n/gitweb-dependency' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hama
n
o
Me
r
ge
branch 'jc/maint-bran
c
h-mergeopti
o
ns
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C Hamano
Merge branch 'jc/maint-add-
p
-overlapping-
h
u
n
ks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Doc
u
mentation/git-fs
c
k
.
txt: fix typo:
unr
e
adable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
sen
d
-pack: a
v
oid deadl
o
ck on
git://
p
ush with fai
l
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff
King
c
o
nn
e
c
t
: let calle
r
s
k
n
ow if
connection
i
s
a
socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
connect: tre
a
t
g
e
n
e
ric pr
o
x
y
proces
s
e
s l
i
ke
s
s
h processe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
sideb
a
n
d
_de
m
ux(): fix d
e
cl-a
f
t
e
r-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t350
3
:
t
est c
h
e
r
ry pi
c
king a
n
d
reverti
n
g root comm
i
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
r
e
v
e
r
t: allow r
e
vertin
g
a roo
t
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
cherry-pick: han
d
le root commits with external strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
p
date draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
M
e
rge
b
ranch 'cn/forma
t
-patch-quiet' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge branch 'jm/mergetoo
l
-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
M
e
rge branch
'
jk/for
m
a
t
-patch-quote-s
p
ecia
l
-in
-
from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge
b
ra
n
ch 'vh/gi
t
-svn-
d
oc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Ham
a
no
git_
o
pen_noatim
e
(): dro
p
unu
s
ed
p
ar
a
m
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
H
amano
s
h
a1_file:
t
ypofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
a
d
d, mer
g
e, di
f
f: do not
u
se
s
t
r
c
asecmp
t
o compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Pre
p
a
re for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'aw/maint-reba
s
e-i
-
p-no-ff'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Me
r
ge
b
ranch 'js/blame-p
a
rsename' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'gr/cvsimport-alternati
v
e-cvspass-loc
a
t
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'jk/merge-one-
f
ile-working-tree' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch 'jc
/
fix-diff
-
fil
e
s-unmer
g
e
d
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
ano
Merge branch 'mz
/
m
ai
n
t
-rename-unmerged' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t5
4
0
0: Fix
a
c
o
u
ple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merge branch '
j
c
/
maint-1
.
7
.
4-pa
t
hspec-stdin-and-
c
md
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
M
erge branch 'jc/maint-1
.
6
.
6-pathspe
c
-stdin-and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_re
v
is
i
o
ns(
)
: take pathspec from command
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felip
e
C
ontreras
g
i
t-completion:
fix reg
r
ession in zsh
support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jo
h
annes
S
i
x
t
Hon
o
r
$(pref
i
x) se
t
in con
f
ig
.
mak* when defining ETC_
G
IT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o
C
H
a
mano
Re
v
ert "H
o
no
r
$(
p
refix) set in config
.
mak*
when d
e
fin
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Ham
a
no
t150
7
:
avo
i
d "${parameter<op>'wor
d
'
}
" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C H
a
mano
t3701: ad
d
-p
-
f
ix makes the last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
akub Nare
b
ski
Remove gitweb/
g
itweb
.
cgi and oth
e
r legacy tar
g
et
s
from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
r
ebski
g
i
t-instaweb
:
Simpl
i
fy bu
i
l
d
dep
e
ndency on gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hama
n
o
merge:
ma
k
e branch
.
<name
>
.
mergeoptions correctly o
v
e
rride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João B
r
itto
R
emove duplicat
e
d "
i
s a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Ra
b
bel
i
er
fast-import: fix
o
p
tion
p
arser
for no-
a
rg
optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C Haman
o
Merge branch
'j
s
/maint-1
.
6
.
6-send-pack-
s
tateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
eff
K
ing
send-pack: unbreak
p
ush
ove
r
stateless rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Haman
o
t3701
:
fix here docum
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael
J
Gruber
git-fast-import
.
txt: --re
l
ative-mar
k
s tak
e
s
no pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
hell: add
mis
s
i
n
g
initia
l
ization
of a
r
gv
0
_
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ge
r
n
hardt
t
/annotate-tes
t
s: Use echo &
cat
instea
d
of se
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
ano
Merge bra
n
ch
'
jh/dirst
a
t
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
erge branc
h
'sp/
m
aint-clear-
p
ostfields'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge b
r
a
n
ch
'
jk
/
ma
i
nt
-
stash-oob'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Me
r
g
e branch
'jk
/
maint
-
upload-pack-shallow' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C Hamano
Merge branc
h
'
dm/s
t
ash-k-i-p' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch 'jc/pack-objec
t
s-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C
Ham
a
no
Merg
e
branc
h
'mg
/
r
eflog-with-options' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'jk/stash-l
o
osen-
s
a
fety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
an
o
Mer
g
e branch 'ar/clea
n
-rmdir-emp
t
y' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ham
a
no
Merge
b
ra
n
ch 'm
g
/sha
1
-
pa
t
h-advise' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Va
l
entin Haenel
g
it-add
.
txt: document 'ad
d
.
ignoreEr
r
ors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Cia
r
an
J
e
ssup
Pass empty fil
e
to p4merge where no base is su
i
table
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y Roui
l
lier
Look
f
or password in both
C
VS and CVSNT passwo
r
d files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merg
e
-one-fi
l
e: fix brok
e
n merges wi
t
h
a
l
t
ernate
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f King
add tes
t
s for
m
e
rge-index / merge-one-f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
Hamano
"add -p": work
-
aro
u
n
d an old laz
i
ness th
a
t does
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
ad
d
-
-
interactive
.
perl: facto
r
out r
e
peated --rec
o
unt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hama
n
o
t3701: E
d
iting a split hunk
i
n an "a
d
d -
p
" sessi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
n
o
a
dd -p: 'q'
s
hould really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Start 1
.
7
.
5
.
1 maint
e
nance tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next