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 H
a
m
a
no
Merge branc
h
'ma
i
nt-1
.
7
.
4' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
M
e
r
g
e
b
ranch 'jk/
g
i
t-connection-deadlock
-
fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge b
r
anch 'j
s
/ma
i
nt-send-pack-sta
t
eless
-
rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'jk/mai
n
t-upload-pack-sha
l
l
o
w
' i
n
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge br
a
nch 'jm/m
a
i
nt-d
i
ff-words-wi
t
h-sbe'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
b
r
a
nch 'kk/maint-prefix-in-conf
i
g
-m
a
k' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'mg/diff-uico
n
fig-do
c
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge branch 'ft/gitweb-ta
r
-w
i
th-gzip-n' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge branc
h
'ss/doc-sv
n
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
n
o
Merg
e
branch 'jn/form
a
t-patch-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ham
a
no
Me
r
ge bran
c
h
'
jc/maint-pathspec-st
d
in-and
-
cmd
l
ine'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge bran
c
h 'jk/c
h
erry-pick-root-w
i
th-
r
esolve
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'
rg/
c
o
p
y
-gecos-username' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merg
e
bra
n
ch 'fc/completion-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch
'jk/git-connection-deadlock-f
i
x' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge branch 'js/main
t
-
send-pack-stateless-rp
c
-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ham
a
no
Merge
branch 'svn-fe
-
maint' of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
N
guyen Thai Ngoc D
u
y
i
nit/clone
:
remove short option -L a
n
d doc
u
m
e
n
t --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim Me
y
ering
d
o not read be
y
ond end
of malloc'd buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
M
ic
h
ael J Gruber
git-sv
n
: Fix git
s
vn log
--show-co
m
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nied
e
r
p
r
o
vi
d
e a
c
opy of
the
L
GPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test
core
.
gitproxy configuratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Rafa
e
l Gieschke
copy_gec
o
s: fix no
t
addi
n
g nlen to l
e
n when p
r
ocessing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C
H
amano
Merge
b
r
anc
h
'js
/
maint-1
.
6
.
6-send-p
a
ck-statele
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
U
pdate
d
raft
release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
erge branch 'jn/maint-format-patch-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merg
e
branch '
s
s/
c
herry-pi
c
k-x-doc' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'v
r
/me
r
ge-base-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
Hamano
Merge branch 'sr/maint-fast-import-ti
g
hten-option-pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge bran
c
h 'jc
/
t15
0
6
-shell-par
a
m-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Me
r
ge branch 'jc/
f
ix-add-u-unmer
g
ed' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
a
n
ch
'
jn/gi
t
web-d
e
pendency' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'jc/maint-branc
h
-mergeoptions' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge
branch 'j
c
/
m
aint-add
-
p-overlap
p
i
n
g-hunks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Document
a
t
ion/g
i
t-
f
s
ck
.
txt: fix typo
:
unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
send-pack:
a
v
o
id
d
eadloc
k
on
g
it:// push with
fail
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
on
n
ect: let callers k
n
o
w
if connect
i
on is
a
s
ocket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
connect:
tr
e
at generic proxy processes like
s
sh proces
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Hamano
sideband_demux():
fix decl-after
-
stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
t3503: test che
r
ry p
i
cking and reverting
r
oot co
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff
King
revert: allow reverting a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
cherry
-
pi
c
k:
h
a
ndle root com
m
i
t
s with external strate
g
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Upd
a
te draft release n
o
tes
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
br
a
nch 'cn/for
m
at-
p
a
t
ch-quiet' into m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hama
n
o
M
e
r
ge br
a
nc
h
'jm/me
r
getool-
s
ubmodules' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
erge branc
h
'j
k
/format-patch-quote-s
p
ecia
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge br
a
nch 'v
h
/g
i
t-svn-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
git_
o
p
e
n_noatime()
:
drop
u
nused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
ha
1
_file:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than Nied
e
r
add, merge
,
diff
:
do not use st
r
casecmp
t
o compare
.
.
.
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
Hamano
Merge branch '
a
w/maint-
r
e
b
ase-i-p-n
o
-f
f
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Ha
m
a
no
Merg
e
bran
c
h 'js/b
l
ame-parsename' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'gr/cvs
i
m
p
o
r
t-
a
l
t
ernative-cvspas
s
-
loc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
Merg
e
branch 'cj/
p
4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Merge b
r
anch 'jk/merge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Me
r
ge
b
ranch
'
j
c/fix-diff-
f
i
les-unmerge
d
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch 'mz/main
t
-
rename-unmerged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herlan
d
t540
0
: Fix a co
u
ple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C Ham
a
no
Merge branch 'jc/maint-1
.
7
.
4-
p
athspec
-
stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
r
a
nch 'jc/maint-1
.
6
.
6-pa
t
hs
p
ec-stdin-
a
n
d
-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_revisions():
take pathspec fr
o
m
command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe C
o
ntrer
a
s
git-comple
t
ion
:
fix
regr
e
ssion in zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
o
hannes Si
x
t
Ho
n
or $(prefix) set in co
n
fig
.
mak*
w
h
en defining E
T
C_
G
IT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hamano
R
e
v
ert "Honor
$(prefix) s
e
t in config
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t15
0
7: avoid
"${paramete
r
<op>'word'}
"
i
nside doub
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
u
n
io C Hama
n
o
t3701:
a
dd-p
-
fix makes the last
test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub Narebski
Remove gitweb/gi
t
web
.
cgi and other le
g
acy targets
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 Nar
e
bski
gi
t
-instaweb: Simplify b
u
ild 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 Ham
a
no
merge: make branch
.
<name>
.
merg
e
o
ptions
c
orrectly
o
v
erride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Britt
o
R
emove d
u
plicat
e
d "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sve
r
r
e Rabbelier
fast-impor
t
: fix option pars
e
r for no-arg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C
H
aman
o
Merge
branch 'js/maint-1
.
6
.
6-send-pack-stateless
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff Kin
g
send-pac
k
: unbreak
push
o
ver
stat
e
less rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io
C Hamano
t37
0
1:
f
i
x her
e
document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fa
s
t-import
.
txt: --
r
elative-marks takes no p
a
rameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
she
l
l: add m
i
ssing initiali
z
a
t
ion
of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhar
d
t
t/annotate-t
e
s
t
s:
U
se echo & cat inst
e
ad of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C Hamano
G
it 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h
'jh/d
i
rstat'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
man
o
Merge branch 'sp/maint-c
l
ear-pos
t
f
i
elds' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branc
h
'jk
/
main
t
-
s
tash-oob
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge bra
n
c
h 'jk/maint-
u
pload-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
H
amano
Merg
e
branch 'd
m
/stash-k-i-p'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jc/pack-objec
t
s-
b
igfile' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
M
e
rge branc
h
'mg/r
e
f
l
og-with-opti
o
ns' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'j
k
/stash-lo
o
s
en-
s
a
f
et
y
'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch
'a
r
/clean-rmdi
r
-em
p
ty'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
g
e
branch 'mg/sha
1
-path-
a
dvise'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin
Haenel
g
it-add
.
t
xt: document '
a
dd
.
ig
n
oreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n J
e
ssup
P
a
ss
e
mpty
fil
e
to p4mer
g
e where n
o
b
ase i
s
suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Gu
y
R
ouil
l
ier
Look for p
a
s
s
word in both CV
S
and CVSNT pas
s
w
o
rd files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
merge-one-file: fix
b
r
oken
m
e
r
ges with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests f
o
r m
e
rge-index / m
e
rg
e
-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
"
a
dd -p": wor
k
-ar
o
u
nd an old lazine
s
s that does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--inte
r
active
.
p
e
rl:
f
actor out
repeated --r
e
count
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o C Hamano
t3701:
E
d
iti
n
g a spl
i
t
hunk in an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p: '
q
' should
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 maintena
n
c
e
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next