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 'jc/maint-pathspec-stdin-and-cmdline' into maint
2011-05-26
Jun
i
o C Hama
n
o
Merge b
r
a
nch 'jc/maint-
p
athspec-s
t
din-and-
c
mdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge branch 'jk
/
cherry-pick-root-w
i
t
h
-
r
es
o
lv
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C
H
amano
Me
r
ge branch
'
rg/copy-gecos-us
e
r
n
ame'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge branch 'fc/completion-zsh'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'j
k
/git-con
n
ection-dea
d
l
o
ck-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'j
s
/maint-send-pack-stateless-rpc-
d
e
adlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C Hamano
Merge branch
'
s
v
n
-fe-ma
i
nt' of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguye
n
Thai Ngoc
D
uy
init/clone:
r
emove short option -L and
document --separ
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michae
l
J
G
r
uber
git
-
svn
:
Fix gi
t
svn log --show-comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Git
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan
N
i
e
der
prov
i
de a copy
of the LGPLv
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Je
f
f Kin
g
test
c
or
e
.
gitp
r
oxy configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gi
e
schke
cop
y
_gecos: fi
x
not adding nle
n
t
o
l
en when pr
o
cessing "
&
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C Hamano
Merge
branch 'js/maint-1
.
6
.
6
-
send-pa
c
k-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Hamano
Update
d
r
a
ft release notes
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge bran
c
h 'jn/maint-format-patch-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 's
s
/cherry-
p
i
c
k-x-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
M
erge branch 'vr/merge-base-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branc
h
'sr/m
a
int-f
a
st
-
i
m
port-tighte
n
-option-
p
ars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Mer
g
e br
a
nch
'
j
c
/
t15
0
6-shell-param-expansion
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C H
a
m
a
n
o
Merge
bran
c
h '
j
c
/fix-add-u-unm
e
rged'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge bran
c
h 'jn/
g
itw
e
b-depende
n
cy'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
c
/
maint-branch
-
m
e
rgeo
p
tions' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Haman
o
Me
r
ge bra
n
ch 'jc/m
a
int-
a
dd-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Mey
e
ring
D
o
c
u
mentation/git-fs
c
k
.
txt: fi
x
typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack:
a
void
d
eadlock on git
:
//
p
ush w
i
th faile
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
conn
e
ct: let ca
l
lers
k
now if conne
c
tion is a
s
ocket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: tre
a
t generic
p
roxy processes
l
i
ke ssh
p
rocesse
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Hamano
s
i
de
b
a
nd_de
m
ux
(
): fix decl
-
after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t350
3
:
t
est cherry
picking and reverting r
o
o
t
c
o
mmits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f K
i
ng
rev
e
rt: allow reverting a root
c
ommit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick: han
d
l
e
root commi
t
s
w
ith external strateg
i
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
ma
n
o
Update draft rel
e
ase n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o
C Hamano
Merge branch 'cn/format
-
pat
c
h-q
u
iet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge branch 'jm/mergetool-s
u
b
mo
d
u
l
es'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio
C H
a
m
ano
Merge bran
c
h 'jk/format-pat
c
h-q
u
ote-sp
e
cial
-
in
-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge branch 'vh
/
g
i
t
-
svn-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Haman
o
git
_
o
pen_noatime():
d
rop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
Hamano
sha
1
_file:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
o
nathan Nieder
add, merge,
diff: do not use
strc
a
s
ecmp to comp
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Prepare f
o
r 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
e
rge branch 'aw/maint-rebase-i-
p
-no-ff' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
uni
o
C
Hamano
Merge branch 'j
s
/bla
m
e-pa
r
sen
a
me'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Merg
e
branc
h
'gr/cvsimpor
t
-alt
e
rnat
i
ve-cvspass-l
o
catio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Mer
g
e
branc
h
'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ham
a
n
o
Merge
b
r
an
c
h
'
jk/
m
erge
-
one-file-working-tre
e
' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge b
r
anch 'jc/fix-diff-fil
e
s
-
unme
r
ged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Mer
g
e branch '
m
z
/
mai
n
t-rena
m
e-unmerged'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix
a coup
l
e of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
j
c/
m
aint-1
.
7
.
4
-
p
athspec-st
d
in-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
Merge branch 'jc/ma
i
nt-1
.
6
.
6-p
a
thspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Ha
m
ano
set
u
p_revisions(): t
a
ke pa
t
hspec
f
r
om
c
ommand line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
git
-
co
m
pletion: fix regr
e
s
s
ion in zsh suppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Ha
m
ano
t15
0
7: a
v
o
i
d
"${parame
t
er<op>'wo
r
d'}
"
inside doub
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701:
a
dd-p-fix ma
k
es the last test to p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebs
k
i
Rem
o
ve gi
t
w
e
b/gitweb
.
cgi
a
nd
o
ther lega
c
y
targets
fro
m
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub Na
r
ebs
k
i
git-instaweb: Simplify build dependency on gi
t
web
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 Hamano
m
e
rge
:
make branch
.
<na
m
e>
.
m
ergeoptio
n
s corre
c
t
l
y
o
v
erride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britt
o
Remove duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
S
v
erre Rab
b
elier
fas
t
-import: f
i
x option parser for no-arg opt
i
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
Merge b
r
a
n
c
h
'j
s
/ma
i
nt-1
.
6
.
6-send-pack-s
t
ateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack: u
n
b
r
ea
k
push
o
v
er stateless rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Hamano
t3
7
01: fix here documen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
ichael J
G
ruber
gi
t
-fast-import
.
txt
:
-
-relative-marks
t
a
kes n
o
parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
shel
l
: ad
d
miss
i
ng initi
a
lization
of arg
v
0_p
a
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ger
n
hardt
t/annotate-tests: Use
e
cho & cat in
s
tea
d
of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
M
erge b
r
anch 'jh
/
d
i
r
s
tat' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ha
m
ano
Mer
g
e branch
'sp/maint-clear
-
postfields' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merg
e
branch 'jk/maint-stash-oob'
i
nto
m
ain
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hama
n
o
Merg
e
b
r
anch 'j
k
/maint-upload-pack
-
shallow
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge bran
c
h 'dm/stash-k-i-p' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Mer
g
e
br
a
nc
h
'jc/p
a
ck-obje
c
t
s
-bigfile' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'm
g
/
r
e
flog-with-option
s
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
Merge branch 'jk/sta
s
h-loosen-saf
e
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Merge br
a
nch 'ar/clean-rm
d
ir-empty' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ha
m
a
n
o
M
e
rg
e
branch 'mg/sha1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
lenti
n
Haen
e
l
git-a
d
d
.
txt: docum
e
nt 'a
d
d
.
ign
o
reE
r
rors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass
empty file to p4merge where no
base is s
u
i
t
ab
l
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouil
l
ier
Look
f
o
r passwo
r
d in both
CVS a
n
d CVSNT pa
s
sword files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
me
r
ge-one-fil
e
:
fix broken me
r
ges with
alte
r
nat
e
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
ef
f
King
add tes
t
s for m
e
rge
-
index / me
r
ge-one-fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
"add -p": w
o
rk-around an old laziness that
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
mano
a
d
d-
-
i
n
ter
a
ctive
.
per
l
: facto
r
out
r
e
peated --reco
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Haman
o
t3701: E
d
iting a
s
plit hunk in an "add -p
"
session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
Hamano
add
-
p: 'q' should re
a
lly
quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o C Hamano
Start
1
.
7
.
5
.
1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ha
m
ano
Merge br
a
nch 'mg/x-ye
a
rs-
1
2-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain R
a
bot
git-send-email
:
fix
m
issing sp
a
ce in erro
r
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
osh St
o
ne
blame: to
l
e
r
a
t
e
bogus
e-mail add
r
ess
e
s a b
i
t
better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew W
o
ng
git-re
b
ase
-
-intera
c
tive
.
sh: pr
e
s
e
r
v
e-merges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Je
f
f K
i
ng
pr
e
tty: quot
e
r
f
c8
2
2 s
p
ecials in email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in
H
ae
n
el
git-sv
n
.
tx
t
: small t
y
pefa
c
e
i
m
provements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-sv
n
.
tx
t
:
m
o
v
e option des
c
rip
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n Haenel
git
-
s
vn
.
t
x
t:
f
ix u
s
age of --ad
d
-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
H
a
mano
h
ttp:
c
lear
POST
F
IELDS
w
hen initializing a slo
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C H
a
m
a
no
Merge branch 'js/maint-1
.
6
.
6
-send-pack-s
t
ateless-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johann
e
s Sixt
se
n
d-
p
ack:
a
void dea
d
lock
when pack-object dies e
a
rly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
G
i
t 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "add -u" that s
o
me
t
ime
s
fails to resolve
u
nmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next