repo.or.cz
/
git
/
jrn.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'
2011-05-23
Junio C Hamano
Merge b
r
anch 'jm/maint-
d
iff-
w
ords-wi
t
h
-sbe'
commit
|
commitdiff
|
tree
2011-05-23
Junio C Hamano
Merge br
a
nch 'j
s
/min
g
w-shutdown'
commit
|
commitdiff
|
tree
2011-05-23
Junio C
H
ama
n
o
M
erge
branc
h
'ms/ls-
r
e
m
ote-exit
-
w
i
t
h
-
status
'
commit
|
commitdiff
|
tree
2011-05-23
Junio C Ham
a
no
Merge
branch 'mg/c
o
nfig-sy
m
bol
i
c-con
s
tants
'
commit
|
commitdiff
|
tree
2011-05-23
Junio C
H
a
mano
Merge branch 'a
b
/i18n-scripts-basic'
commit
|
commitdiff
|
tree
2011-05-23
Junio C Hamano
Me
r
ge branch 'jc/
m
agic-pathspec'
commit
|
commitdiff
|
tree
2011-05-23
Junio C
H
amano
Merge b
r
an
c
h 'jk/blame-line-porcelai
n
'
commit
|
commitdiff
|
tree
2011-05-21
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-20
Jim Meye
r
in
g
d
o
no
t
read beyond en
d
o
f
mal
l
oc'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Micha
e
l J Grube
r
g
it-svn
:
Fix git
s
v
n log
--s
h
ow
-
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Haman
o
Update draft rele
a
se notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Merge bran
c
h 'jc/m
a
in
t
-1
.
7
.
4-pathspec-s
t
din-and-c
m
dline'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Haman
o
Mer
g
e
bra
n
ch
'
r
g/copy-
g
e
c
os
-
user
n
ame'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bran
c
h 'jl/submodul
e
-conf
l
icted-g
i
tmodul
e
s
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
erge branch
'
jc/re
p
lac
i
ng'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hama
n
o
Merge branch 'nd/spa
r
se-co-fi
x
'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C
Hamano
Merge branch 'ld
/
p
4
-p
r
eserve-
u
ser-name
s
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Merge
b
ra
n
ch
'
ms/tagname-d
o
es-not
-
begin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Me
r
ge branch
'
jk/git-c
o
nne
c
tion-deadlo
c
k-fi
x
'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio
C Hamano
Merge
b
ranch 'js/maint-send-pack-s
t
a
te
l
ess-rpc-de
a
dloc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge b
r
anch
'jk/cherry
-
pick
-
r
oo
t
-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge branch 'jc/maint-p
a
th
s
p
e
c-
s
tdin
-
and-
c
mdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
e
rge 1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
R
evert
"M
e
r
ge branc
h
'en/
m
erg
e
-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io
C
H
amano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Makefile: so
r
t
T
EST_PROGRAMS
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonath
a
n Nieder
provide a copy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
M
i
chael Schubert
ls-
r
e
mote:
t
he --e
x
i
t-cod
e
option r
e
po
r
ts "no
matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Joha
n
nes Sixt
Windows: add a wrap
p
er for the
shutdown
(
) s
y
stem call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff King
test core
.
gitproxy configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gieschke
copy
_
gecos: f
i
x not a
d
d
ing
n
len to le
n
w
h
en processing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Ramsay Jones
set
u
p
.
c
: Fix
s
ome "symbol not
d
ecla
r
ed
"
s
parse warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Mi
c
h
ael J Gruber
config: Give error me
s
s
a
ge w
h
en no
t
changing a multivar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Michael J G
r
ube
r
c
onf
i
g: define a
n
d document exit codes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio
C
Hama
n
o
Update rel
e
ase notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
unio C Hamano
Merge branc
h
'js/ma
i
nt-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C H
a
mano
Merge bran
c
h 'j
c
/convert'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C Ham
a
no
Merge
branch '
c
i/
c
om
m
it--int
e
ractive-
a
tomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branch 'sg/com
p
letion-upda
t
es'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Ha
m
ano
Merge branch
'
kk/maint
-
pr
e
fi
x
-in-config-ma
k
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branc
h
'
m
g/
m
e
r
ge
-
ff-config'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
ama
n
o
Update draf
t
r
e
lease notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge bran
c
h
'jn/mai
n
t-f
o
r
mat-p
a
tch-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge br
a
n
c
h '
s
s/che
r
ry-p
i
ck-x-doc' in
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge branch '
v
r/m
e
rge-base-doc' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
's
r
/maint
-
fast-import-
t
ighten-option-p
a
rsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
M
e
r
ge bra
n
c
h
'jc
/
t1506-shell-param-exp
a
nsion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
n
c
h
'jc/fix-ad
d
-u-unm
e
r
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jn/gitweb-depen
d
ency' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/maint
-
bran
c
h-mergeopti
o
ns' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ran
c
h 'jc/maint-add-p-ove
r
l
ap
p
ing-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m Meye
r
ing
D
o
cumentation/git
-
fsck
.
txt: fix typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
send-pack:
a
void
deadlock
o
n git://
pus
h
with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
connect:
l
et ca
l
ler
s
know if connection i
s
a soc
k
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
co
n
n
e
ct: treat
generic proxy
pr
o
cesses like
ssh
p
ro
c
esses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
sideband_demu
x
(): fix decl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: tes
t
cherry pi
c
ki
n
g and r
e
verting root commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
revert
:
a
l
l
ow reverting a r
o
ot commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
herry-pick: handle
root c
o
mmits wi
t
h external str
a
t
e
g
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hama
n
o
S
y
nc release notes fo
r
1
.
7
.
6 to exclude what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
man
o
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch
'cn/format
-
p
at
c
h-q
u
iet' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hama
n
o
Merge branch 'j
m
/mergetool-sub
m
od
u
les' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
Hamano
Merge
b
ranch 'jk/format-p
a
tch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
M
erge branch '
v
h/git-svn
-
doc'
i
n
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
ano
g
i
t_open
_
noatim
e
(
)
: dr
o
p unused par
a
m
e
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
no
r
e
a
d_
s
ha1_file(): allow select
i
v
e bypassin
g
of
r
eplacemen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
inline
lookup_replace_objec
t
()
calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C
Hama
n
o
read
_
s
ha1_fi
l
e
(
):
g
et rid of read_sha1_file_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
t60
5
0: make sure we test
n
ot just co
m
m
i
t
repla
c
em
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
D
ecl
a
re lo
o
kup_re
p
lac
e
_object() in
cache
.
h,
not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Ævar A
r
nfjörð
B
jarmason
M
a
kefile: add
x
get
t
ext target
for *
.
sh
f
i
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Æv
a
r Arnfjörð
B
jarmason
git-sh-i18n
.
sh: a
d
d GIT_GETTEXT_P
O
ISON support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfj
ö
rð Bjarmas
o
n
git-s
h
-
i
1
8n
.
sh:
ad
d
n
o
-op get
t
ext() and eval_gettext
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfjö
r
ð Bjarma
s
o
n
gi
t
-
sh-
i
18n--envsubst:
o
ur
o
wn envsubst(
1
)
f
o
r
eval_gette
x
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge, d
i
ff: do
not
u
s
e strcasecmp t
o
c
o
mpare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Jens Leh
m
a
n
n
Submod
u
les: Do
n
't parse
.
git
m
odules
w
hen i
t
con
t
a
i
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Heiko Voigt
test
that git status works with
m
erg
e
conflict in,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Luk
e
Diamand
git-p4: warn i
f
git authorsh
i
p won't
be retained
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Update
d
r
a
ft rel
e
a
s
e note
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Ham
a
no
Merge branch 'bf/commit-template-n
o
-cle
a
nu
p
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
ma
n
o
M
e
rge
branch 'jc/t
1
506-
s
hell-pa
r
am-
e
xpansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Me
r
ge
b
r
a
nch 'rr/rerere-lib
i
f
y-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ham
a
no
Merg
e
b
ranch 'js
/
maint-
s
end
-
pack-stateles
s
-rpc
-
d
eadloc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branch 'jh
/
dir
s
tat-lin
e
s'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge bra
n
c
h 'jc/fix-ad
d
-u-
u
nmerged'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Mer
g
e
branch 'jn/setu
p
-r
e
visi
o
ns-glob-and-friends-passthru
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Merge branch
'
cn/log-pars
e
-opt
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Pr
e
p
a
re for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge
branch 'aw/mai
n
t-
r
ebase-i
-
p-no-f
f
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
an
o
M
e
r
ge b
r
a
nch '
j
s/b
l
am
e
-parsename' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hama
n
o
Mer
g
e branc
h
'gr/cvsimpo
r
t-alternative-c
v
spass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cj/p4me
r
ge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
br
a
nch
'
jk/merge-on
e
-file-w
o
rki
n
g
-
tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'jc/f
i
x
-
d
i
ff-fil
e
s-unme
r
ged'
into maint
commit
|
commitdiff
|
tree
next