repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint
2011-05-26
Junio C Hamano
M
erge b
r
an
c
h 'js/maint-
s
end
-
p
ack-
s
tateless-rpc-dead
l
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 's
v
n-
f
e-maint' of
git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Ngu
y
en Tha
i
Ngoc Duy
init
/
clone: remove sh
o
r
t
option -L and do
c
u
m
e
n
t --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michae
l
J
Gr
u
ber
git-svn: Fix git svn log --show-com
m
it
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
Jonath
a
n N
i
e
d
er
provid
e
a copy
o
f the
L
GPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
n
i
o
C
Haman
o
Merge branch '
j
s/maint-1
.
6
.
6-send-pa
c
k
-st
a
teless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Update draft release
n
o
t
e
s
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'jn/maint-format-
p
a
t
ch-doc'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge br
a
nch 'ss/cherry-pick-x-doc'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge
b
ranch 'vr/mer
g
e
-
base-doc'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Me
r
ge b
r
anch 'sr/maint
-
fast-im
p
o
rt-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
Merge b
r
anch 'jc
/
t1506-sh
e
ll
-
p
a
ram-expansion
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge br
a
nch
'jc/fix-add-u-unme
r
ge
d
' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge bra
n
c
h 'j
n
/gitweb-de
p
endency' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branc
h
'
j
c/ma
i
nt-branch-mer
g
eop
t
ions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge bran
c
h 'jc
/
ma
i
n
t
-a
d
d
-p
-
overlap
p
ing-hunks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim M
e
y
ering
D
o
c
umentation/git
-
fs
c
k
.
txt: fix typo: unreada
b
le
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband
_
demu
x
(): fix decl-afte
r
-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Update draft release n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Merge branch 'c
n
/format-p
a
tch-quiet
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge
b
r
a
nch 'jm/merget
o
ol-submod
u
l
e
s' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge branc
h
'jk/format-patch-quote-specia
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
M
e
rge bra
n
ch 'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
g
it
_
open_noatime(
)
:
d
ro
p
unu
s
ed pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
sha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge,
d
iff: do not
u
se strcasecmp to com
p
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Haman
o
Pre
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch 'aw/m
a
i
n
t-rebase-i-p-no-ff'
i
nto
mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
a
mano
Merge branch 'js/blame-parsenam
e
' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge
b
ranch
'gr/cv
s
i
mport-alternative
-
c
v
spass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge
b
ranc
h
'cj/p4me
r
ge' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
M
erge branch
'jk/merge-one-fil
e
-worki
n
g-tre
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merg
e
branch 'jc/fix-d
i
ff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Mer
g
e
b
ranch 'm
z
/maint-renam
e
-unmerged' in
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
la
n
d
t5400: Fix a c
o
uple
of typo
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hamano
t1
5
07:
a
void
"${p
a
rameter<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 test
t
o pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub
N
a
rebski
Remove gi
t
we
b
/g
i
tweb
.
c
gi and other 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-in
s
t
aweb: Simpli
f
y build depe
n
d
en
c
y on git
w
eb
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
merge: make b
r
anch
.
<
n
ame>
.
m
ergeo
p
tio
n
s correctly
o
verride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
B
r
i
tto
Remo
v
e duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sver
r
e
Rabbel
i
er
fast-impor
t
: fix op
t
i
o
n par
s
er fo
r
n
o-arg op
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge b
r
anch 'js/m
a
int-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff
Kin
g
send-pack
:
unbreak p
u
sh over st
a
te
l
ess
r
pc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t
3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael
J
Gruber
g
i
t-fast-import
.
txt: --relati
v
e-mark
s
takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sh
a
ro
v
shel
l
: add mis
s
ing initializati
o
n of
a
r
g
v0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gern
h
ardt
t/annotate-tests
:
Use
echo & cat instead
o
f sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
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
Junio
C Hamano
Mer
g
e
b
r
anch 'sp
/
maint-clear-postfi
e
lds' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge branch
'
jk
/
mai
n
t-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Mer
g
e bra
n
ch 'jk/mai
n
t-upload-pack-s
h
allow
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Haman
o
Merge branch '
d
m/stash-k-i-p
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'jc/p
a
ck-object
s
-bi
g
f
i
le' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge b
r
anch 'mg/reflog-
w
ith-options' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
M
e
r
g
e
br
a
nch 'jk/stash-loosen-s
a
fety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Haman
o
Merge
b
ran
c
h 'ar/c
l
ean-rmdir-empty'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch '
m
g
/
s
ha1-path-a
d
v
ise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valen
t
in H
a
enel
g
i
t
-add
.
txt: docu
m
ent
'
add
.
ig
n
ore
E
rro
r
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 empty file to
p4me
r
ge
where no
base is su
i
table
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for password
i
n
both CVS
a
nd CVSNT
p
as
s
w
ord
f
i
les
.
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 merges with alter
n
a
t
e w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f King
add t
e
s
ts fo
r
merge-index / merge-one-f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
"add -p": w
o
rk-arou
n
d an old laz
i
ness
tha
t
do
e
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
uni
o
C Haman
o
add--interactive
.
p
e
rl:
factor out repeated --re
c
ount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
t
3701: Editing a split hunk in a
n
"add
-p" sessio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
add -p: 'q' should r
e
ally quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Ha
m
ano
Start 1
.
7
.
5
.
1 main
t
enance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C
Hamano
Merge
b
ranch 'mg/x-yea
r
s
-12-
m
o
n
ths
'
into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: fix miss
i
ng spa
c
e in er
r
or message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
o
s
h
S
tone
bla
m
e: tolerate bogus e-mail
a
ddresses a bit
b
et
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andr
e
w
Wong
gi
t
-rebase--interactiv
e
.
sh: preserve-merge
s
fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
prett
y
: quo
t
e rfc822 specials in email a
d
dr
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
a
lentin Haen
e
l
git-svn
.
txt: sma
l
l typeface impro
v
ements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt:
m
ove option description
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
gi
t
-
svn
.
t
x
t: fix usage of -
-
add-a
u
thor-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Hama
n
o
http: cle
a
r
P
OSTFIELDS
w
hen i
n
itializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hamano
M
e
rge
b
ranch 'js/ma
i
n
t-1
.
6
.
6-s
e
nd-pa
c
k
-
stateless-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
send-
p
ack: a
v
oid deadlock when
p
a
ck
-
object dies
e
arly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
un
i
o C
H
aman
o
Fix
"add -u" that so
m
et
i
m
e
s fails
to resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C H
a
ma
n
o
d
if
f
-fil
e
s: show
unmerged entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
diff: remove often
u
n
u
sed para
m
e
ters from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
Hamano
diff
.
c: r
e
turn filepair from di
f
f_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
t
est: us
e
$
_z40
from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michae
l
J Gruber
dat
e
: avoid "X
y
ears, 12 months"
in relat
i
ve date
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
n
i
o C Ham
a
no
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 with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Gi
t
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gru
b
er
g
i
t-
s
v
n
.
txt:
D
o
cument --me
r
gein
f
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Haman
o
Revert "run-command:
pre
t
tify -D_FORTIFY_SOU
R
C
E
work
a
ro
u
nd"
commit
|
commitdiff
|
tree
2011-04-15
Se
b
astian
S
chuberth
doc:
C
larify that "cherry
-
pick -x" do
e
s
not use
"
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Ni
e
der
D
o
cum
e
ntation: descr
i
be the format of messages w
i
th
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonath
a
n Ni
e
der
Restructure docume
n
ta
t
ion f
o
r git-merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
V
inc
e
nt van Ra
v
esteijn
Do
c
umenta
t
ion:
update to git-merge-
b
ase --octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
e
né Scharfe
archive
:
d
ocument limitation of tar
.
umask
c
onfig
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
ichae
l
J Gru
b
er
t3306,t5304: avoid clock skew
i
ssues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next