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 'fc/completion-zsh' into maint
2011-05-26
Ju
n
i
o C Hamano
Merge branch 'fc/
c
ompletion-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge
b
ranch 'jk/git-co
n
nection-deadlo
c
k-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Haman
o
M
erg
e
branch
'
js/maint-
s
end-pack-s
t
ateless-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
c
h
'sv
n
-
f
e-main
t
' o
f
git://repo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
N
g
uyen
T
hai Ng
o
c
Duy
ini
t
/clone: remove
s
hort option -L
and document -
-
separ
a
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
M
i
ch
a
el J Gr
u
ber
gi
t
-svn: Fix git
s
v
n
log --show-co
m
mit
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
Jonathan Nieder
p
rovide
a
copy of th
e
LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jef
f
King
test
c
ore
.
git
p
ro
x
y conf
i
gu
r
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
i
o C
Ha
m
ano
Me
r
ge branch 'js/
m
aint-1
.
6
.
6-s
e
nd-pa
c
k-s
t
ateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C Hamano
Update dra
f
t re
l
ease n
o
te
s
to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch '
j
n/m
a
int-format-p
a
tc
h
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
ranch
'ss/cherry-p
i
c
k
-
x-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Mer
g
e
bran
c
h
'
vr/merge
-
bas
e
-
d
oc' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
e
r
g
e branc
h
'sr/
m
aint-fast-import-ti
g
hten-o
p
tion
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
aman
o
Merge branch 'jc/
t
1
506-shell-param-expansion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'jc/fix
-
add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
ano
Merge branch 'jn/gi
t
web-depe
n
denc
y
' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C H
a
man
o
M
e
rge b
r
anch 'jc/m
a
in
t
-
branc
h
-
m
e
r
g
eoption
s
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge br
a
nc
h
'
j
c
/maint-add-p
-
overl
a
pping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m Meyeri
n
g
Documentat
i
on/git-fsck
.
txt: fix
typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-p
a
ck: av
o
i
d
deadlock on git:// pu
s
h with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
conn
e
ct: let calle
r
s
k
now if connectio
n
is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
connect: t
r
e
a
t generic pr
o
x
y
processes l
i
ke ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
sideband_demux():
fix decl-after-
s
tmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Updat
e
draft
release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
H
amano
M
e
rge b
r
anch 'cn/f
o
r
m
a
t-patch
-
quie
t
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Mer
g
e
branch 'jm/mergetool-submodules
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'jk/for
m
a
t
-p
a
tch-
q
uote-s
p
ecial
-
in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Haman
o
Merge bran
c
h
'vh/git-s
v
n-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
gi
t
_open_noat
i
me(): drop unused
p
arameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_f
i
le: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge, diff:
do not use strca
s
ecmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
P
repare fo
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Mer
g
e branch 'aw/maint-rebas
e
-i-p-no
-
ff' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branc
h
'js/blame-parsename' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
M
e
r
ge bra
n
ch 'gr/cvsimpo
r
t-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch
'cj/p4
m
erge
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch 'jk/mer
g
e-one-file-working-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
branch 'jc/
f
ix-di
f
f-files-u
n
merged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hamano
Merge branch 'mz/maint-rename-un
m
e
rged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Her
l
a
nd
t5400: Fix a c
o
uple
of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Cont
r
eras
git-com
p
letion
:
fix regression in zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hama
n
o
t
1507:
a
void "${parameter<op>
'
word'}"
i
nside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
u
n
i
o
C Hamano
t370
1
: add-p-fix makes the la
s
t
test to pas
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Nar
e
bski
Remove gitweb/
g
i
t
w
eb
.
c
g
i and oth
e
r legacy 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 Narebski
git-instaweb
:
Sim
p
lify build depe
n
dency on
g
itweb
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 Hamano
merge: make branch
.
<name>
.
mergeoptions
co
r
rectly
override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ã
o
B
ritt
o
Remove
duplicated "is
a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sver
r
e
R
abb
e
lier
fa
s
t-impor
t
:
fix o
p
ti
o
n par
s
e
r
for no-arg op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge b
r
anch 'js/main
t
-1
.
6
.
6-send
-
pack-
s
t
atele
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Je
f
f K
i
ng
send-pack:
u
nbreak push over stateless r
p
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Haman
o
t3701:
f
i
x here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-f
a
st-import
.
t
xt: --re
l
ative-mark
s
takes no para
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
ell: a
d
d
missing i
n
itialization of
a
rgv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
rian Gernhardt
t/annot
a
te-tes
t
s:
U
se ech
o
& cat instead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
H
a
mano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
amano
Merge br
a
n
c
h 'jh/dirstat' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e
bran
c
h 'sp/maint-
c
lear-postfi
e
lds' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ha
m
ano
Merge br
a
nch 'j
k
/maint-st
a
sh-o
o
b' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
Merge
b
ranch 'jk/maint-u
p
load-pack-
s
hal
l
ow' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C
H
a
m
a
n
o
M
e
r
g
e branch
'dm
/
stash-k-i-p' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Me
r
ge b
r
anch
'
jc/pack-
o
bjects-bigfile'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
m
g/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
a
mano
Merge branch
'
jk/sta
s
h-
l
oosen-saf
e
ty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merg
e
br
a
n
ch
'
ar/clean-rmdir-e
m
pty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Ha
m
a
n
o
Merge
branch
'
mg
/
sha1-path-advise' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Val
e
n
t
in Haenel
git-add
.
txt: doc
u
m
ent
'add
.
ign
o
reErrors
'
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
Pa
s
s e
m
pty file to p4merge where
no base
i
s suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouil
l
ier
L
o
o
k
for password in
b
oth CVS and CV
S
NT
password
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file: fix broken 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 te
s
ts for merge-index / me
r
ge
-
one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
un
i
o C Hamano
"ad
d
-p":
w
o
rk-aro
u
nd an
o
ld lazines
s
that doe
s
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
ad
d
--interactive
.
perl: factor out rep
e
ated --re
c
ount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a sp
l
it hunk in an "add -p"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
d
d -
p
: 'q' shoul
d
really q
u
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Star
t
1
.
7
.
5
.
1 maintenance
t
ra
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
Me
r
ge b
r
anch 'm
g
/x-years-
1
2-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-s
e
nd-email: f
i
x missing
spac
e
i
n error mes
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame
:
t
ole
r
a
t
e
bogus e-ma
i
l addre
s
s
e
s a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
gi
t
-rebase--i
n
teractive
.
sh: pr
e
serve-merges fa
i
l
s
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Je
f
f King
pretty: quote rfc822 specials
i
n ema
i
l addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
t
x
t:
s
mall typeface improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
i
t-svn
.
txt: move
o
p
t
i
o
n descr
i
ptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
V
a
lentin
H
aenel
git-svn
.
txt: fix
u
sage of --add-author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Ju
n
io
C
H
a
mano
http: clear
POSTFI
E
L
DS
wh
e
n
i
nit
i
alizing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hamano
Merge branch '
j
s/
m
a
int-1
.
6
.
6-send-
p
ack-state
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
J
ohannes
S
ixt
send-pack: avoid d
e
adlock when pack
-
object dies
e
arly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
Git
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fi
x
"
a
dd -u" that some
t
imes fails
t
o resolve
u
nmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff-files: show u
n
m
e
r
g
e
d entri
e
s co
r
rectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
dif
f
:
remove often u
n
used
parameter
s
from
d
iff
_
u
nmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C H
a
ma
n
o
diff
.
c:
r
eturn fil
e
pair from diff_unmer
g
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z4
0
fro
m
t
e
st
-
lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Mi
c
hael J Gruber
dat
e
:
a
void "X year
s
, 12 months"
i
n relative date
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
Git
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ham
a
no
Sync wi
t
h
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C
H
amano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-sv
n
.
txt: Document --mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio
C
Hamano
Revert "
r
un-command: p
r
ett
i
f
y
-
D
_
FORTI
F
Y_SOURCE workaround"
commit
|
commitdiff
|
tree
next