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 'jk/git-connection-deadlock-fix' into maint
2011-05-26
J
unio C Ham
a
n
o
Mer
g
e branch
'
jk/g
i
t-connec
t
ion
-
dead
l
ock-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
M
erge bran
c
h 'js
/
maint-send-pack-sta
t
eless-rpc
-
deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e branch 's
v
n-fe-
m
aint' of git://repo
.
or
.
c
z/gi
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen
T
hai
N
goc Duy
init/clon
e
: remove short option -L and document --s
e
para
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael
J
Gruber
git-svn: Fix git svn log --sh
o
w-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
u
ni
o
C Haman
o
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan
N
ieder
provide a copy
o
f
the L
G
PLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitprox
y
c
o
nfig
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
i
o
C Hamano
Merg
e
branch
'j
s
/maint-1
.
6
.
6-sen
d
-pack-
s
tat
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
amano
U
p
d
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-16
Ju
n
io
C Hamano
Merge branch
'
jn/main
t
-format-pat
c
h-doc
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge
branch
'ss/c
h
erry-pick-
x
-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C
H
amano
Mer
g
e branc
h
'vr/merge-ba
s
e-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Ham
a
no
Merge
b
ra
n
ch 'sr/maint
-
f
ast-import-tigh
t
en-option-pars
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge bran
c
h '
j
c/t
1
506-she
l
l-param
-
expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'jc
/
fix-add-u-unme
r
ged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
Merge br
a
nch '
j
n/gitweb-dep
e
n
d
e
ncy' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
man
o
M
erg
e
branch '
j
c
/
maint-branch-
m
ergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-add-p-
o
verlapping-hunks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ji
m
Meyering
Documentation/git-fsck
.
txt: fix typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
s
e
nd-pack:
a
void deadlock
o
n g
i
t:// push with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
connec
t
: let cal
l
ers k
n
o
w if co
n
nection is a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
connect: treat
generic p
r
o
x
y p
r
oces
s
es li
k
e ss
h
processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
sideband_demux(): fix d
e
cl-
a
fter-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
un
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
Junio
C
Hamano
Merge branch 'cn/fo
r
ma
t
-p
a
tch-quiet' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
n
o
Merge branch 'jm/mergeto
o
l-sub
m
odu
l
es' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merg
e
b
ran
c
h '
j
k/f
o
rmat-patch-quote-special-in-
f
r
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io
C Hamano
Me
r
ge branch 'vh/git-
s
vn
-
doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
git_op
e
n_noatime(): dr
o
p u
n
used pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
sha
1
_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonat
h
an Nied
e
r
add, merge, diff: do not use
strcasecmp to co
m
p
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Prepare fo
r
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
Merge branch 'aw/maint-rebase-i-p-no-ff' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch
'
js/blam
e
-
p
arsena
m
e' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Mer
g
e branch 'gr/cvsim
p
ort-alter
n
a
ti
v
e-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch 'cj/p4merge' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge br
a
nc
h
'
jk/merge-one-file-wo
r
king-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/
f
ix-dif
f
-files-un
m
erged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'mz/
m
aint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C
Haman
o
t1507: avoid "${p
a
ra
m
et
e
r<op>'word'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p-fix mak
e
s the last te
s
t to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove gitweb/gitw
e
b
.
c
gi and ot
h
e
r
legacy target
s
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
g
it-inst
a
we
b
: Simplify bui
l
d
dependency on
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 Hamano
me
r
ge: make branch
.
<
n
ame>
.
mergeoptions corr
e
c
t
ly
overr
i
de
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João B
r
itto
R
e
move
dupli
c
ated
"is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre
R
abbelier
fast-impo
r
t
:
fix option parse
r
for no-arg op
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Haman
o
Merge branch
'
js/maint-1
.
6
.
6-s
e
nd-pack-state
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff Kin
g
send-
p
ack: unbreak push over stat
e
less rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Haman
o
t3701: fix her
e
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mic
h
ael J Gruber
git-
f
ast-import
.
t
xt: --relative-marks take
s
n
o p
a
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima
S
harov
shell: add
m
i
s
sin
g
initi
a
l
i
zat
i
o
n of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t
/annotate-t
e
s
t
s
:
U
s
e e
c
ho & c
a
t
instead
of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
G
it 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C
Hamano
M
e
rge bran
c
h 'jh/dirstat'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch
'sp/main
t
-c
l
ear-p
o
stfiel
d
s' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge b
r
a
n
ch 'jk/m
a
int
-
stash-oo
b
' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
e
rge branc
h
'jk/maint-upl
o
ad-pack-
s
h
allow' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Mer
g
e b
r
a
nch 'dm/stash-k-i-p' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge
branch 'jc/
p
ack-objects-bigfile
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
n
c
h
'mg/reflog-with-options
'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge bran
c
h 'jk/st
a
sh
-
loose
n
-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Merge br
a
nch 'ar/
c
lean-rmdir-empt
y
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C H
a
man
o
Merg
e
bran
c
h 'mg/sha1-path-advi
s
e
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Valent
i
n Hae
n
e
l
git-ad
d
.
txt: docu
m
ent 'add
.
i
gnor
e
Errors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
C
iar
a
n Je
s
sup
Pas
s
empty f
i
l
e
to p4merge where no
base is suita
b
le
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
uy
R
ou
i
llie
r
L
o
ok
for pass
w
ord
in
b
oth CVS and CVSNT pa
s
sword files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
n
g
merge-one-file: fix broken merg
e
s with
a
lternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f King
add tests for
m
erge-index / merg
e
-
one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Ham
a
n
o
"add
-
p"
:
wo
r
k-around an
o
l
d
laz
i
n
e
ss that does
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
ad
d
-
-
i
nteractive
.
p
e
rl: factor
out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
t3701: Editing a split hu
n
k in an "add -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
aman
o
add -p: 'q'
sho
u
ld really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
St
a
rt 1
.
7
.
5
.
1 maintenance
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Merge
b
ranch 'mg/x-years
-
12-mo
n
ths'
into
m
aint
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvain Rabot
git-
s
end-em
a
il: fix missing space
i
n error m
e
ssag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tolerate b
o
gus e-mail a
d
d
r
esses
a bit be
t
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Won
g
git-re
b
ase--interactive
.
sh:
p
reserve-
m
erges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Je
f
f Kin
g
pretty: quote rfc82
2
speci
a
ls in email addr
e
s
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-
s
vn
.
txt:
s
mal
l
typeface improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: mov
e
o
p
tion descr
i
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Ha
e
n
e
l
g
it-svn
.
txt:
f
ix u
s
a
g
e o
f
-
-add-
a
uthor-fr
o
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http
:
cl
e
ar P
O
STFIEL
D
S when in
i
tializing
a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C H
a
m
ano
Me
r
ge
b
ranc
h
'js/maint-1
.
6
.
6-sen
d
-pack-sta
t
eless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
send
-
pa
c
k
: avoid
de
a
dlock when pack-o
b
ject die
s
early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o C H
a
m
ano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "
a
dd
-
u" that
s
ometi
m
es fails to resolve unmerge
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
diff-
f
i
l
es: show unm
e
rg
e
d entri
e
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
Ham
a
no
diff:
r
emove
of
t
en unu
s
ed pa
r
ameters from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
diff
.
c
:
retu
r
n
f
i
lepair
f
rom diff_unme
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
e
st
:
use $_z40 from
t
est
-
lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: avoid "X
y
ears, 12 mo
n
ths
"
in rela
t
ive dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
H
amano
Git
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
Sync wi
t
h 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
G
it 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
M
i
chael J
Gruber
gi
t
-svn
.
txt: D
o
cument --
m
e
rg
e
info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert "
r
un-command: pre
t
tify -D
_
FO
R
TI
F
Y
_S
O
URCE w
o
rkar
o
und"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian Schuber
t
h
doc: Clari
f
y
that "cherry-
p
ick -x" does not use "gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nied
e
r
Docume
n
tation:
d
e
scribe the
f
ormat of messa
g
es with
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next