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 'jm/maint-diff-words-with-sbe' into maint
2011-05-26
Ju
n
io C Hamano
Merge br
a
nch
'
jm/main
t
-
d
iff-words-with-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bran
c
h 'kk
/
m
a
int
-
prefix-in
-
config-mak' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
anch 'mg/d
i
ff-
u
ico
n
fig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
H
amano
M
e
rge bra
n
c
h
'
ft/gitweb-ta
r
-wit
h
-gzip-n'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ham
a
no
Me
r
ge br
a
nch 'ss/doc
-
svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge b
r
an
c
h 'jn/for
m
at-patch-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'jc/maint-
p
athspec-
s
td
i
n
-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
M
e
rge branch 'jk/
c
herry-pick-roo
t
-with-resolv
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
bra
n
ch 'rg/copy-geco
s
-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C Hamano
Merge
b
ra
n
c
h 'f
c
/completion-
z
sh
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch
'
jk/git-c
o
nnection-deadloc
k
-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch
'js/
m
aint-sen
d
-p
a
ck
-
stateless-r
p
c-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch '
s
v
n
-
f
e
-ma
i
nt' of git://repo
.
or
.
cz/gi
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Th
a
i Ngoc Duy
i
nit/clone
:
r
e
mo
v
e s
h
ort opt
i
on -L and docume
n
t --s
e
parate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyering
do not
r
ead beyon
d
end of mallo
c
'd buf
f
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Mic
h
ael J Gruber
git-svn: F
i
x gi
t
svn log --show-c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Haman
o
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jo
n
athan Ni
e
der
provi
d
e a copy of the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
git
p
roxy configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Raf
a
el Gieschke
co
p
y
_
gecos: fix
not ad
d
i
ng nlen to
len w
h
e
n proc
e
ssing "&
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Hamano
Merge branch
'js/maint-1
.
6
.
6-send-pack-stateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
U
pdate draft
release not
e
s
to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
Merge br
a
nch
'
j
n/maint
-
fo
r
ma
t
-
p
atch-do
c
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'ss/cherry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
anch
'
vr/merge-base-doc' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'sr/
m
aint-fast-impo
r
t
-
tighten-opti
o
n-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
branch 'jc/t15
0
6
-shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge br
a
nc
h
'jc/fix-add-
u
-unme
r
ged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ham
a
n
o
Merge branc
h
'jn/gitweb-
d
e
pend
e
nc
y
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
Mer
g
e
b
ranch 'jc/maint-branc
h
-merg
e
options
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C
H
aman
o
M
e
rge
branch '
j
c/
m
ain
t
-add-p-overlapping-hunks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyerin
g
Docume
n
tat
i
on/git-f
s
ck
.
txt: fix typo
:
unreadab
l
e -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack: avoid deadlock on git:// push with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff Kin
g
connect: let
cal
l
ers know if co
n
nection is a socke
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
connect: treat generic
p
roxy
p
ro
c
esses like ssh
proces
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
side
b
and_dem
u
x(): fix decl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
t3
5
03: test cherry picking and
r
everting root commi
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
revert: a
l
low re
v
erti
n
g
a
r
o
ot c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f
K
ing
cherr
y
-pick:
h
andle
r
o
ot commits with external
strat
e
gies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io
C Hamano
Update draft
r
elease notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Mer
g
e
branch 'cn/form
a
t-patch-quiet' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
man
o
Merge bran
c
h
'jm/
m
ergetool
-
s
u
bmodule
s
' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge branch 'jk/format-pa
t
ch-quo
t
e
-special-
i
n-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
branch 'vh/git-svn-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
git_o
p
en_noatim
e
(
)
:
dro
p
unused
p
aram
e
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Ham
a
no
s
h
a1
_
fi
l
e: typo
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nie
d
er
add, merge, diff:
do not u
s
e strca
s
ec
m
p to co
m
pa
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hama
n
o
Pr
e
pare
fo
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'aw/maint-
r
ebase-i-p-no-ff' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
e
r
ge branch '
j
s/blame-par
s
ename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Me
r
ge b
r
anch 'gr/cvsimpor
t
-alternative-cvspas
s
-
locat
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch 'c
j
/
p
4merge'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'jk/me
r
ge-one-file-wo
r
kin
g
-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge br
a
n
ch '
j
c
/fix-dif
f
-
fil
e
s-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge bra
n
c
h
'
m
z/maint-ren
a
me-unmer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a couple of
typ
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge branch
'jc/ma
i
nt-1
.
7
.
4-pathspec-
s
t
d
in-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C
Hamano
M
e
rg
e
branch 'jc
/
maint-1
.
6
.
6-pathspec-
s
tdin-
a
nd-cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
J
u
ni
o
C Hamano
setup_r
e
vision
s
(): take pathspec from command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Feli
p
e C
o
ntreras
git-completion: fix regression
i
n zsh
s
upp
o
rt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Johan
n
es S
i
xt
Honor
$
(prefix) set in conf
i
g
.
ma
k
* when defi
n
i
n
g ETC_GIT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Re
v
e
r
t "Honor $(pr
e
f
i
x) set in c
o
nfi
g
.
mak* when def
i
ning
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Haman
o
t
1
507: avoid
"
${parameter<o
p
>'wor
d
'
}
" inside d
o
uble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
H
ama
n
o
t3701:
a
dd
-
p-fix mak
e
s
the
l
as
t
test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebsk
i
R
e
move git
w
eb/gitweb
.
c
gi and other l
e
gacy t
a
rg
e
ts 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: Si
m
plify bui
l
d depend
e
ncy on gitw
e
b
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
H
amano
me
r
ge: make branch
.
<name>
.
mergeoptions correctl
y
override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
Remove duplicated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fast-imp
o
rt: fix option parser
for no
-
arg op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Hamano
Mer
g
e
bran
c
h
'
j
s/ma
i
nt-1
.
6
.
6-send-pack-
s
t
a
teless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
se
n
d-pa
c
k
:
unbreak push
over stateless rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t370
1
:
f
ix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael
J Gruber
git-f
a
st-import
.
txt: --r
e
lative-mark
s
t
a
kes no pa
r
amete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharo
v
shell: add missing initializa
t
i
o
n of ar
g
v
0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
ri
a
n Ge
r
n
hardt
t/anno
t
a
t
e-tests: Use
echo
& cat in
s
te
a
d of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
a
ma
n
o
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Mer
g
e br
a
nch 'sp/maint-clear-postfields' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'jk/maint-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge bran
c
h
'jk/ma
i
nt-u
p
l
oad
-
pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch '
d
m/stash-
k
-i-p'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'jc/
p
ack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ha
m
a
n
o
Me
r
g
e branc
h
'mg/reflog-with-opti
o
ns' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ha
m
ano
M
e
rg
e
branch
'
jk/
s
tas
h
-loose
n
-safety'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C
Hamano
M
erge branch 'ar/clea
n
-rmdir-empty' into
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hama
n
o
Merge
b
ranch 'mg/sha
1
-path-advis
e
'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Va
l
entin Haen
e
l
gi
t
-add
.
txt:
d
ocumen
t
'add
.
ign
o
reError
s
'
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
P
ass
emp
t
y f
i
l
e to p4merge wh
e
r
e no base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouil
l
ie
r
L
oo
k
for passw
o
r
d
in bot
h
CVS and CVS
N
T password files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff King
m
erge-one
-
file: fix
b
roken merges with
a
lterna
t
e w
o
rk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
add tests for merge-index / merge-
o
ne-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
Hamano
"add -p": work-around 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 H
a
mano
add--in
t
e
racti
v
e
.
perl: f
a
ct
o
r out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio
C
Hama
n
o
t3701
:
E
d
i
ting a spli
t
hun
k
in an "add -p
"
ses
s
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
add -p: 'q' sh
o
u
ld re
a
lly quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 mainten
a
nc
e
t
ra
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
Me
r
ge bran
c
h 'mg/x-y
e
ars-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send
-
email: fi
x
missing s
p
ace in er
r
or
m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
b
l
a
m
e
:
tolerate
bo
g
us e-mail addresses
a
bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Kacper Kornet
Honor $(prefix)
set in c
o
nfi
g
.
mak*
w
h
e
n
d
efinin
g
ETC_GIT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next