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 'jk/cherry-pick-root-with-resolve' into maint
2011-05-26
J
unio
C
Hamano
M
erge
b
ran
c
h 'jk/c
h
erry-pic
k
-root-wit
h
-
r
e
so
l
ve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge branch 'rg/copy-
g
e
c
os-us
e
rnam
e
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Haman
o
Merge br
a
nch 'fc/completi
o
n
-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connectio
n
-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'js/maint-s
e
n
d
-p
a
c
k-
s
tat
e
less-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Me
r
ge
b
ranch
'
s
v
n-fe-maint' of git:/
/
r
epo
.
or
.
cz
/
git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Th
a
i Ngoc Duy
init/clone:
r
e
m
ove short
o
ption -L and doc
u
me
n
t --
s
e
p
arate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Mi
c
hael J Gruber
git-svn: Fix git svn lo
g
-
-sho
w
-com
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
G
i
t
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
provide
a co
p
y
of the
L
GPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
J
eff King
te
s
t c
o
re
.
gitproxy configur
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
a
fae
l
Gieschke
copy_gecos:
fix
n
o
t adding nlen
to le
n
w
h
en
proces
s
in
g
"&
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge
b
ranch 'js/m
a
int-1
.
6
.
6
-sen
d
-pack-statel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
Ham
a
n
o
Update draft
rele
a
se notes
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hama
n
o
M
e
rge bran
c
h 'j
n
/main
t
-format-pat
c
h-d
o
c' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
erge branch 'ss/che
r
r
y-pic
k
-
x-do
c
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
branc
h
'vr/merge-base-doc
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
ama
n
o
Merge branch 'sr/maint-fas
t
-
i
m
port-tig
h
ten-opt
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge b
r
anch 'jc/t1506-shell-param-expans
i
on-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
ranch
'
jc/fix-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ranch 'jn/gitweb-
d
ependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
ma
n
o
Merge branch 'jc/maint-
b
ran
c
h-mergeoption
s
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ham
a
no
Merge branch 'jc/maint-add-
p
-
overlapping-
h
u
n
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Me
y
ering
Do
c
umentat
i
on/g
i
t-fsck
.
txt: fix typo: unread
a
b
le -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
s
e
nd-pac
k
:
avoid dea
d
l
ock
on g
i
t:
/
/ push wi
t
h
faile
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
connect: l
e
t callers kn
o
w
if connection
is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
con
n
ect: tre
a
t gen
e
ric proxy
p
r
ocesses li
k
e ssh
p
rocesses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
sideb
a
n
d
_
dem
u
x(): fix decl-aft
e
r-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f
King
t
3503:
test
c
herry
p
icking and revertin
g
roo
t
com
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
rev
e
r
t: allow rev
e
r
ti
n
g a r
o
ot com
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
cherr
y
-
p
ick: hand
l
e
root commits wit
h
exte
r
nal strate
g
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
U
pd
a
te draft
rel
e
as
e
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/
f
orma
t
-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
M
erge branch 'jm/
m
ergetool-
s
ubmodules' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Merge branch 'jk/format-pat
c
h-quote-special
-
in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
M
e
rge br
a
n
c
h
'vh/git-svn-d
o
c' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
g
i
t
_open_noatime(): d
r
op un
u
sed parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
sha1_fi
l
e
:
typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge
,
di
f
f:
d
o not use strcase
c
mp to compa
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Prepar
e
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
ano
Merge bran
c
h '
a
w/maint-reba
s
e-i
-
p-no-ff' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
H
ama
n
o
Me
r
ge branch 'js/b
l
ame-pars
e
nam
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge bran
c
h 'gr/cvsim
p
ort-al
t
ernative-cvs
p
as
s
-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Merge bra
n
c
h
'c
j
/
p4
m
erge' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Me
r
ge branch 'jk/mer
g
e
-on
e
-file-
w
orking-tr
e
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fi
x
-
d
iff-files-unm
e
rged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branc
h
'
mz/maint
-
rena
m
e-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5
4
00: Fix a cou
p
le of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Cont
r
era
s
git-c
o
mpletion: fix r
e
gres
s
ion in zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Hamano
t15
0
7
:
avoid "$
{
paramete
r
<op>'word'}" inside
double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
unio C Hamano
t3
7
01: ad
d
-p-
f
ix make
s
t
he last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove gitweb/gitweb
.
cgi and other le
g
a
cy ta
r
g
ets 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
N
arebs
k
i
git-i
n
stawe
b
: Simplify build dependenc
y
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
J
unio C Ha
m
ano
mer
g
e: make branch
.
<name>
.
mergeoptions correct
l
y ove
r
ride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Bri
t
to
Remov
e
duplicate
d
"is
a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabb
e
lier
fas
t
-import: fix option parser for no
-
arg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Haman
o
Merge bran
c
h 'js/
m
aint-1
.
6
.
6-send-
p
ack-stat
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
s
e
nd-
p
ack: un
b
reak pus
h
over
s
tateless rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here documen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
h
ael
J Gruber
git-fast-impor
t
.
txt: --relative-marks take
s
no para
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
im
a
Sharov
shell:
add missing i
n
i
t
i
a
l
i
z
ation of argv
0
_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
rian Gernhar
d
t
t/an
n
otate-tes
t
s: Use echo &
c
at instead
o
f
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Gi
t
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
H
amano
Merge
br
a
nch 'jh
/
dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
a
no
M
e
r
g
e b
r
anch
's
p
/
m
a
i
n
t
-
c
lear-postfi
e
lds' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge b
r
anc
h
'jk/maint-
s
tash-oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge bran
c
h
'jk/m
a
int-upload-pa
c
k-shallow' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ha
m
ano
Merge b
r
anch 'dm
/
stash-k-i-p
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Me
r
g
e
branc
h
'jc/pac
k
-objects-bigfile
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hama
n
o
Merge branch 'mg/reflog-w
i
th-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge bra
n
ch 'jk/stash-loo
s
en-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ham
a
no
Merge b
r
a
n
ch 'ar/cl
e
a
n-rm
d
ir-empty' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Merg
e
b
ra
n
ch 'm
g
/sha
1
-path
-
advi
s
e
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Valent
i
n Hae
n
el
git-ad
d
.
txt: document 'ad
d
.
ignoreErr
o
rs'
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
Pas
s
empty
f
ile to p4me
r
ge where no ba
s
e i
s
sui
t
ab
l
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rou
i
ll
i
er
Look fo
r
pass
w
ord in bot
h
CVS and CVSNT
password files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff King
merge-on
e
-fil
e
: fi
x
broken m
e
r
g
es wit
h
alt
e
rnate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
add tests fo
r
merge-index / merge-on
e
-
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
amano
"add
-
p"
:
work-around
a
n old laziness t
h
at do
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
dd--interactive
.
perl:
f
actor out repeat
e
d --recoun
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
t
3
7
01:
Edi
t
ing a split hunk
in
a
n
"add -p
"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
ad
d
-
p: 'q' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 mainte
n
a
nce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
Merge
b
ranch
'mg/x-years-12-months' into mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
Sylv
a
in Rabot
git-sen
d
-email: f
i
x missi
n
g sp
a
ce in error m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: to
l
erate bogus e-mail addr
e
sses
a
bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
g
i
t-rebase--intera
c
tive
.
sh:
preserve-merge
s
fails
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
e
f
f
King
pretty:
q
u
ote rfc822 specials
i
n
e
m
ail ad
d
res
s
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
t
i
n
Hae
n
el
gi
t
-svn
.
t
x
t: s
m
all typeface improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haen
e
l
git
-
sv
n
.
txt: move option de
s
criptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
git-svn
.
txt: fix usage of --add-author-fr
o
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http
:
clea
r
POSTFIELDS
when i
n
itializing a s
l
ot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
J
unio C Hamano
M
e
r
ge b
r
anch 'js/maint-1
.
6
.
6-send-pack-s
t
ateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Jo
h
a
n
n
es Sixt
send-
p
ack:
avoid
deadlock
when p
a
ck
-
object
dies early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Gi
t
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Haman
o
Fix "
a
dd -u"
that some
t
imes fails t
o
resolve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C
H
a
m
a
no
diff
-
files: show unm
e
r
g
ed
entries correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff:
r
e
m
o
ve often unused param
e
ters
f
rom diff
_
unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C H
a
mano
di
f
f
.
c:
return filep
a
ir from
diff_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Haman
o
test: use
$
_
z
40 from
test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next