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 'kk/maint-prefix-in-config-mak' into maint
2011-05-26
Jun
i
o C Hamano
Merg
e
branch 'k
k
/
m
aint-prefix-in-
c
onfig
-
mak' i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C Ham
a
no
M
e
rge branch
'
m
g
/dif
f
-uiconfig-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge br
a
nch 'f
t
/gitweb-tar-with-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
Hamano
Merge branch 'ss
/
doc-s
v
n' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch 'jn/format-
p
atch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Mer
g
e branc
h
'jc/maint
-
pat
h
spec-stdin-a
n
d-cm
d
line'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch
'jk/cherry-pi
c
k-root
-
with-r
e
solve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge branch 'r
g
/copy-gec
o
s-username' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Haman
o
Merge branch '
f
c/completio
n
-zs
h
' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
M
erge branch 'jk/git
-
connection
-
d
e
a
dlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
b
r
an
c
h
'js
/
maint-s
e
nd-
p
ac
k
-state
l
ess-rpc-dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
Haman
o
Merge branch 'svn-fe-maint' of
g
it://repo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Tha
i
Ngoc Duy
init/clone: re
m
ove short option -L
and docume
n
t --se
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 sv
n
log
-
-s
h
ow-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
uni
o
C H
a
mano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jona
t
han Nieder
provide a
c
op
y
o
f the LGP
L
v2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff King
te
s
t
c
ore
.
g
it
p
roxy confi
g
uration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Raf
a
el Gieschke
copy
_
gecos:
fix not adding nle
n
to
l
en whe
n
processing
"&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
H
amano
M
e
r
g
e branch 'js/maint-1
.
6
.
6-sen
d
-
pack-stateless
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Update draft
r
elea
s
e
n
otes
to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Ha
m
ano
Mer
g
e b
r
anch
'
jn/main
t
-format-patch-doc' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
ano
Merge
b
ranch 'ss/cherry-pick-x-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Mer
g
e branch 'vr/mer
g
e
-
b
ase-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C
Hamano
Merge
branch 'sr/maint-fast-impor
t
-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h 'jc/t1506-
s
hell-param-expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
Merge branch '
j
c
/
f
i
x-add-u-unme
r
ged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Ham
a
no
M
erge br
a
nch 'jn/gitweb-depende
n
c
y
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
Hamano
M
e
rge
branch 'jc/mai
n
t
-
branch-mergeoptions' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e
b
ranch 'jc/maint-
a
dd-p-o
v
erlapp
i
ng-hunks' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ji
m
Meye
r
in
g
Documentation/git-fsck
.
t
x
t:
f
ix typo: unreadab
l
e -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
ing
sen
d
-
p
a
c
k: avoi
d
deadlock on git:// pu
s
h with fail
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
connect
:
l
e
t c
a
llers kno
w
if conne
c
ti
o
n is a so
c
ket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
Kin
g
connect:
treat
g
eneri
c
proxy processes
like
ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
s
i
d
e
b
a
nd_de
m
ux(): fix decl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: t
e
st cherry picking a
n
d reve
r
ting root commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: allo
w
r
everti
n
g
a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
cherry-pick: handle
r
oot co
m
mits with external str
a
tegies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
a
mano
Update draft releas
e
note
s
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
o
rmat-patch-quie
t
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
ama
n
o
Mer
g
e
br
a
nch
'
j
m/merget
o
ol
-
submodules'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branch 'jk/fo
r
m
at-pat
c
h
-qu
o
te-s
p
e
cial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
n
o
Merge b
r
anch 'vh/git-s
v
n-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hama
n
o
git_open_noa
t
ime(
)
: drop unused parame
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
sha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jon
a
than Nieder
add, merge, dif
f
: do not u
s
e strcase
c
mp to compar
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare
f
or 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge branch 'a
w
/maint-
r
ebase-i-p-n
o
-
f
f
' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch 'j
s
/bl
a
me-parsen
a
me'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Ham
a
n
o
M
e
rge branch 'gr/
c
vsi
m
port-altern
a
tive-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
erge
b
r
an
c
h 'cj/p4merge'
int
o
main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merg
e
b
r
a
n
ch 'jk/merge-one-file-worki
n
g-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Ham
a
no
Merge
b
ranch 'j
c
/fix-diff-files-
u
nmer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch
'
mz/maint-rena
m
e-u
n
merged' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
H
erland
t
5400:
Fix a couple
o
f typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge branc
h
'jc
/
main
t
-1
.
7
.
4-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
ra
n
ch 'jc/maint-1
.
6
.
6
-
pathsp
e
c-stdin
-
and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
s
e
tup_revisions(): tak
e
pathspec fr
o
m co
m
m
an
d
line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
g
i
t
-completion: fix r
e
gr
e
ssion in zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Johannes
S
i
xt
Honor $(pre
f
ix) set in config
.
mak* when defining ETC
_
GIT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C
Hamano
Revert "Honor $(pref
i
x) set in config
.
m
ak* whe
n
defini
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
ni
o
C Hamano
t
1
50
7
: avoid "${
p
arameter<op>'word'}"
i
nside d
o
u
ble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
i
o C Haman
o
t37
0
1: add-p-fix makes t
h
e last te
s
t
t
o pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Rem
o
ve gitweb/gitweb
.
cgi and oth
e
r
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
N
ar
e
bski
git-
i
nst
a
w
eb: S
i
mplif
y
build d
e
pendency on gitwe
b
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: ma
k
e bra
n
ch
.
<na
m
e>
.
m
erg
e
options correc
t
ly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ão Bri
t
to
Remove dupli
c
ated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
S
verr
e
Ra
b
belier
f
a
st-import: fix option p
a
r
s
er for no-
a
rg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio
C
H
amano
Merg
e
br
a
n
ch 'js/maint-
1
.
6
.
6-send-pack-state
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack: u
n
break push
o
ver statel
e
ss
rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: f
i
x here d
o
cum
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fa
s
t-imp
o
rt
.
t
x
t: --relative
-
marks takes no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima
S
h
arov
she
l
l: add mis
s
ing ini
t
ialization of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Br
i
an
G
ernhardt
t/annotat
e
-tests: Use echo & cat instead
of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge br
a
nch 'jh/dirstat' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
Merge branch
'sp/m
a
i
n
t
-cl
e
a
r
-
postfields'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch '
j
k/maint-st
a
s
h
-oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Me
r
ge branch
'
jk/ma
i
nt
-
upload
-
pack-s
h
allow'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
br
a
nch 'dm/stas
h
-k-i-p' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jc/pack-object
s
-bigfile' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
Merge branc
h
'mg/
r
eflog-
w
ith
-
op
t
ions'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
Hamano
M
e
rge bran
c
h
'
jk/stash-
l
oosen-safety' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Me
r
g
e
branch 'ar/cle
a
n
-
rmdir-empty' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'mg/sha1-path-ad
v
i
s
e' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-
a
dd
.
t
x
t: d
o
cum
e
nt 'add
.
i
g
noreErrors'
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
Pa
s
s e
m
pty fil
e
to p
4
merge
w
here
n
o base is sui
t
able
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouill
i
er
Look for password in both CVS
a
nd CVSN
T
passwor
d
f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
m
erge
-
o
ne-file: fix broke
n
merges wit
h
alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
add tests for
m
e
r
g
e-index /
m
erge-one
-
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p": wo
r
k-around an
o
l
d
laziness that does no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
dd--
i
n
t
erac
t
ive
.
perl: factor out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
t37
0
1:
E
diting a split hunk in
an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
add -p:
'q' should r
e
ally quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o C Ha
m
a
n
o
Start 1
.
7
.
5
.
1 mainten
a
nce track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio
C Hamano
Me
r
ge branch
'mg/x-yea
r
s-12-months' into m
a
in
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
a
bot
g
i
t-se
n
d-email
:
fix missing spa
c
e in er
r
or message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
osh Stone
blame: t
o
lerate bogus e-mail
addr
e
ss
e
s a bit
b
etter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Ka
c
per Korn
e
t
Honor $
(
pr
e
f
i
x) se
t
in conf
i
g
.
m
a
k* when defining ETC_GIT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-
r
ebase--
i
n
te
r
activ
e
.
sh: p
r
eserve-merge
s
f
ails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Michae
l
J Gruber
config
.
tx
t
,diff-
o
ptions
.
t
x
t:
porce
l
ain
vs
.
p
l
umbing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next