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/git-connection-deadlock-fix' into maint
2011-05-26
Juni
o
C Hamano
M
e
rge
b
r
anch
'jk/git-connection-deadlock-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C Hamano
M
erge branch 'js/m
a
int-send-pa
c
k-stateless-rp
c
-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranc
h
'svn-fe-main
t
' of git
:
/
/rep
o
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Th
a
i
Ngoc Duy
i
n
it/clon
e
: re
m
ove short opt
i
on -L and d
o
cument --se
p
arate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J G
r
uber
git-svn: Fix g
i
t
s
vn log
-
-show-comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
onatha
n
Nieder
pro
v
ide
a
cop
y
of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff Ki
n
g
te
s
t core
.
gitproxy c
o
nfi
g
urat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge br
a
nch 'js/m
a
in
t
-
1
.
6
.
6
-
send-p
a
ck-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Ham
a
no
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 Hama
n
o
Merge branch
'
jn/maint-format-patch-doc' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
H
amano
Mer
g
e
b
ra
n
ch
'
ss
/
ch
e
rr
y
-pick-x-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Merge bran
c
h '
v
r/merge-base-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h 'sr/main
t
-f
a
st-import-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch
'jc/
t
1506-
s
h
e
ll-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e
b
r
anch
'jc/fix-add-u-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
Merge
b
ran
c
h 'jn/gitweb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'jc/main
t
-branch-m
e
r
g
eoptions'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C
H
aman
o
M
er
g
e bran
c
h 'j
c
/main
t
-ad
d
-p-over
l
apping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentation/git-f
s
ck
.
txt: fix typo:
u
nreadab
l
e -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
send-pack: avoid deadlock o
n
git:// p
u
sh with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect:
l
et ca
l
lers
k
n
o
w if c
o
nnection i
s
a s
o
cket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
i
n
g
con
n
ect: t
r
eat generic pro
x
y pro
c
esses l
i
ke ssh proce
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
side
b
and_demux
(
)
:
f
ix de
c
l
-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
ama
n
o
U
pdate draft
release n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
ano
Merge br
a
nch 'cn/format-patch-qu
i
et'
into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge branch 'jm/m
e
rgetool-submodu
l
es'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Haman
o
Merge branch 'jk
/
f
orm
a
t
-
patch
-
quote-sp
e
c
i
al-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
no
Merge branch 'vh/git
-
svn-
d
oc
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
g
i
t_open_
n
oa
t
ime(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
s
h
a1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonath
a
n Nied
e
r
add,
merge,
d
i
ff: do not use strcasecmp
t
o
com
p
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare 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
b
r
anch 'aw/ma
i
nt-re
b
ase-i-p
-
no-f
f
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch 'js/blame-parsena
m
e
' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
no
Merge
b
ranch
'
gr/cvsimport-alternative-cvs
p
ass
-
lo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge br
a
nc
h
'
cj/p4m
e
rge' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge
b
ranch 'jk
/
mer
g
e-on
e
-file-w
o
rking-tre
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch
'
j
c
/fix-diff
-
files-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ham
a
n
o
Mer
g
e b
r
anc
h
'
mz/mai
n
t-rename-u
n
mer
g
ed' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a couple
o
f
t
ypo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
t1507
:
avoid "${pa
r
amet
e
r<op>'word'}" inside doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
un
i
o C Hamano
t3701: add-
p
-fix ma
k
es the last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove g
i
tw
e
b/gitweb
.
cgi and other le
g
a
c
y
ta
r
gets fr
o
m
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub
Narebski
git-instaweb: Simpli
f
y build d
e
p
end
e
nc
y
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
Ju
n
io C
H
amano
mer
g
e:
m
ake branch
.
<n
a
me>
.
mergeoptions correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remov
e
du
p
licated "i
s
a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
S
v
erre Rabbelier
f
a
s
t-
i
m
po
r
t: fix
option parser f
o
r no-arg
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
M
erge bra
n
c
h 'js/ma
i
nt-1
.
6
.
6-send-pack
-
state
l
e
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pac
k
: unbreak push
over stateless rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix
he
r
e document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
i
c
h
ael J Gru
b
er
git-
f
ast-im
p
ort
.
txt: --
r
e
l
at
i
v
e
-ma
r
ks tak
e
s no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
hell: add missin
g
initialization
o
f ar
g
v0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Bri
a
n Gernhardt
t/
a
nnot
a
te-tests: Use echo & cat instead
o
f
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
erge b
r
anch 'jh/di
r
stat' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch 's
p
/maint
-
clea
r
-postfields'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch
'
jk/maint-stash-oob' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge bra
n
ch 'jk/maint-upload-pack-
s
h
allow' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
Hamano
Merge branch 'dm/sta
s
h-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C H
a
man
o
Merge branch
'
jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hama
n
o
Merge
b
ran
c
h
'mg/ref
l
og
-
with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Haman
o
Merge b
r
anch 'jk/stash-loo
s
e
n
-safe
t
y
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merg
e
br
a
nch 'a
r
/
clean-rmdir-empty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'mg/sha1-path-advise' in
t
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
t
x
t: docume
n
t 'add
.
ignor
e
Er
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
Ciaran
J
e
ssup
P
a
ss empty file to
p4mer
g
e
where n
o
base i
s
suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y
R
ouill
i
er
Look for
p
ass
w
ord in bot
h
CVS and
C
VSNT p
a
ssword files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merg
e
-one-file: fix b
r
oken merge
s
with
a
l
ternate
work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
ad
d
tes
t
s f
o
r merge-in
d
ex / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
un
i
o
C
H
aman
o
"add -p": wo
r
k-around
a
n old laziness that doe
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
uni
o
C Hamano
add--intera
c
tive
.
perl: f
a
ctor
out repeated --re
c
ount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
t3701:
Ed
i
ting a split hunk in an "add
-p" s
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio
C Haman
o
add -p: 'q' shoul
d
really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
Start 1
.
7
.
5
.
1 mai
n
tenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch 'mg/
x
-years-12-months' into m
a
int
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: fix missing space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh
St
o
ne
blame
:
tol
e
ra
t
e bog
u
s e
-
mail a
d
dre
s
ses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andr
e
w
Wong
git-
r
ebase
-
-inte
r
ac
t
iv
e
.
sh: preser
v
e-merge
s
fail
s
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff
K
ing
prett
y
: quote rfc822 sp
e
cials in email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
alentin
H
a
e
nel
git
-
svn
.
txt
:
small typefa
c
e improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
al
e
n
t
in Hae
n
el
git
-
svn
.
txt: m
o
ve
o
ption descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin H
a
enel
git-svn
.
txt: f
i
x usage of --add
-
author-fro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
unio C Ha
m
a
n
o
http: cl
e
a
r
P
O
ST
F
IE
L
DS wh
e
n
i
nitializ
i
ng a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Ha
m
an
o
Merge branch
'
js/ma
i
nt-1
.
6
.
6-send-pack-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
J
o
h
annes
Sixt
s
end-pack: avoid deadloc
k
when pack-object dies early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "add -u" t
h
at some
t
imes fai
l
s to resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
amano
d
iff-files: s
h
ow unme
r
ged en
t
ries c
o
rre
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Ham
a
no
diff:
r
emove often unused
p
arameters
f
rom diff_u
n
merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
diff
.
c
:
r
e
turn
f
ilep
a
ir fro
m
diff_
u
nmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Haman
o
test: use $
_
z4
0
from test-
l
ib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michae
l
J
G
rub
e
r
da
t
e: avoid "X years, 12 months" in
r
elative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Hamano
Git
1
.
7
.
5
-
rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ha
m
ano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
M
i
chael J
G
ruber
git
-
svn
.
txt: Document --
m
ergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
uni
o
C Hamano
Revert "run-command: pretti
f
y -D_FORTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Seba
s
tian Sc
h
uberth
doc: Clarify
t
hat
"
cherry-pick -x" does not use
"
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan
N
iede
r
Do
c
u
men
t
ation: describe the format of mes
s
ages w
i
t
h
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next