repo.or.cz
/
git
/
mingw.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
Ju
n
io C
Hamano
Merge
b
r
anch 'maint-1
.
7
.
4' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadl
o
c
k-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hama
n
o
Me
r
ge branc
h
'js/
m
aint-send-p
a
ck-st
a
tel
e
ss-rpc-deadloc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e
branch
'
jk/maint-
u
pload-p
a
ck-shal
l
ow'
into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge
branch '
j
m/maint-dif
f
-words-with-sbe' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'kk/
m
aint-pre
f
ix-in-config-mak' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'mg/d
i
ff-uiconfig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hama
n
o
Me
r
ge br
a
nch
'ft/
g
i
tweb-tar-w
i
th-gzi
p
-n' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merg
e
branch 'ss/doc-svn'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Haman
o
Merge branch 'jn
/
format-patc
h
-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge bran
c
h
'
jc/maint-paths
p
ec-stdin-and-cmd
l
ine'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C H
a
mano
Merge branch 'jk/che
r
ry-
p
ic
k
-root-with
-
resol
v
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge
b
ranch
'
r
g
/copy-gecos-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge b
r
anch 'fc/com
p
letion-zsh' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/
g
i
t-connec
t
io
n
-
deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
ni
o
C
H
a
mano
Merge branc
h
'
j
s
/
maint-sen
d
-pack-stateless-rp
c
-deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Mer
g
e branch 'svn-fe-m
a
int
'
of git://
r
epo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguye
n
Thai N
g
oc D
u
y
init/clone
:
remove short
opti
o
n
-
L
a
nd document --s
e
parat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim
M
eyering
do
n
ot read beyond
end of
m
al
l
oc'd bu
f
fer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J G
r
ube
r
g
i
t-
s
v
n:
Fix git svn
l
og --
s
how-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
uni
o
C
H
amano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
o
n
a
than Nieder
provid
e
a
c
opy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
J
e
f
f King
test core
.
gitproxy configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Ra
f
a
e
l Gieschke
copy_geco
s
: fix not
adding n
l
en to len when processing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Haman
o
M
e
r
ge branc
h
'js/ma
i
n
t
-1
.
6
.
6-se
n
d-pack-statel
e
s
s-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
U
p
date dra
f
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 H
a
m
ano
Merg
e
branch 'jn
/
ma
i
nt-format-patch-d
o
c' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Me
r
ge br
a
nch 'ss/cherry-pick-x-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Mer
g
e branc
h
'vr/merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
m
ano
Merge branch 'sr/maint-fast-
i
mpo
r
t
-
t
i
ght
e
n-
o
ption-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
H
amano
M
e
r
g
e bra
n
ch 'j
c
/
t1506-sh
e
ll-pa
r
a
m
-
expansion
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C
H
amano
Merge br
a
nch
'jc/fix-a
d
d
-
u-unmerg
e
d'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch
'jn/g
i
t
w
eb-
d
epen
d
ency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-branch-
m
ergeop
t
ions'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Ha
m
ano
Merge bra
n
ch 'jc/m
a
in
t
-add-p-overlapping-hu
n
ks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m
M
eyerin
g
Documentation/git-fsck
.
txt:
fix typo:
u
nreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
send-pack: avoi
d
de
a
dlock o
n
git:
/
/
p
u
sh with fai
l
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
o
n
nect: let
c
a
llers know if connection is a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
connect: treat generic proxy
p
ro
c
esses like ssh p
r
ocesses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_demux(): fix
d
ecl-a
f
ter-st
m
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
t3
5
0
3
: test cherry picking and reverting
r
oot
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
revert: all
o
w r
e
v
e
r
ting a r
o
ot c
o
mmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
c
h
erry-p
i
ck:
handle root commits w
i
t
h
external st
r
at
e
gies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Mer
g
e branch 'cn/format-patch-
q
uiet' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge b
r
anch 'jm/merget
o
ol-sub
m
odules' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merge b
r
anch 'jk/fo
r
ma
t
-
patc
h
-quote-s
p
e
c
ial-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge br
a
nch 'vh/git-svn-doc'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_noatime(): drop unused parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
Ha
m
ano
sha1_file:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than Ni
e
d
e
r
add, merg
e
, diff: d
o
not use
s
trcasecm
p
t
o co
m
p
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o
C
H
ama
n
o
Merg
e
b
ranch 'aw/maint-
r
eb
a
se-i
-
p-no-ff' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch
'js/blame-parsename' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
M
e
rge branch
'
gr/cvsimport-
a
lternati
v
e-cvspass
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Ha
m
ano
Merge branch 'cj
/
p4merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge
branch 'jk/merge-o
n
e-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
Merge br
a
nch 'jc/fix-dif
f
-files-unmerged'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch 'm
z
/m
a
int-rename-unmerged' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
Fix a couple o
f
typo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1
.
7
.
4
-pa
t
h
s
p
ec-
s
tdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Mer
g
e
branch 'jc/
m
aint-1
.
6
.
6-
p
athspec
-
stdi
n
-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
setup_revisions(): take
pathspec from command lin
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
git-completion
:
fix regression in zsh
s
upport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johannes
Sixt
Hono
r
$(prefix)
s
et
i
n conf
i
g
.
ma
k
* w
h
en definin
g
ETC_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
amano
Re
v
e
rt "Honor $(pr
e
fi
x
) set in conf
i
g
.
ma
k
* w
h
en de
f
ining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hamano
t15
0
7: av
o
id "${parameter<op>'word'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
Haman
o
t3701: add-p-fix
makes the last t
e
st to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ja
k
ub
Nar
e
bski
Remove gitweb/gitweb
.
cgi
a
nd other legac
y
targets fr
o
m
.
.
.
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: Simplify
buil
d
depend
e
ncy
o
n gitweb
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
H
amano
merge: make bra
n
c
h
.
<n
a
me>
.
mergeoptions c
o
rrectl
y
override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ão
Britto
R
e
m
o
ve duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fa
s
t-imp
o
r
t
:
f
ix
o
p
tion pars
e
r for
n
o-arg options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C H
a
mano
Merge branch 'js/maint-1
.
6
.
6-send-pack-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jef
f
King
sen
d
-pack: unbreak push
over
s
tatele
s
s rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
t
3
7
0
1: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J G
r
uber
git-fast-imp
o
rt
.
txt: --relative-marks t
a
kes no param
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
D
ima S
h
arov
shell: a
d
d missing initializ
a
t
io
n
of argv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian
G
e
r
n
har
d
t
t/annotate-tests
:
U
s
e echo
&
c
a
t instea
d
of
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio
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 Ha
m
ano
Merge bra
n
ch
'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
M
e
rge branch 'sp/maint-
c
l
e
ar-p
o
stfields' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
e
rge branch 'jk/maint-s
t
ash-oob
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Mer
g
e branch
'
j
k/maint-
u
pload-pack-s
h
allow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'dm/stash
-
k-i-p' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
Merge branch
'jc/pack
-
objec
t
s-b
i
gfile
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Hamano
Merge
b
ranch 'mg/r
e
flog-wit
h
-options
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge
branch 'jk/stash-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C Hamano
M
erge branch 'ar/clean-rmdi
r
-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C Haman
o
Mer
g
e br
a
nch 'mg/sha1-path-advise
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
nel
git-
a
dd
.
t
x
t
:
d
ocument 'add
.
ignoreEr
r
ors'
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 Je
s
sup
Pass empty file to p4merg
e
where no base is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look
f
or password in
b
oth CV
S
and CVSNT password
files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
merge-one-file: fi
x
broken
m
erges wit
h
alternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
add tests for merge-index / merge-one
-
fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"
add -p": w
o
rk-
a
round an old
l
aziness
that d
o
e
s not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
add-
-
interactive
.
perl
:
factor out repeated --re
c
o
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hama
n
o
t3701: Editing a split hunk in an
"
add -p" s
e
ssio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -
p
: 'q' should really qui
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next