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
Junio C Hamano
Mer
g
e branch 'kk/maint-pr
e
fix-in-con
f
i
g-m
a
k' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 'mg/
d
i
f
f-uiconfig-doc' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C H
a
mano
M
e
r
g
e bran
c
h
'ft/gitweb-tar-w
i
th-gzip-n' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch '
s
s/doc-svn'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
amano
M
erge b
r
a
nch 'jn/form
a
t-patch
-
doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch
'
j
c/maint-pathsp
e
c-stdin-and-cmd
l
i
n
e'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge br
a
nch 'jk/cher
r
y-pick-r
o
ot
-
with-re
s
olve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge
b
ranch 'rg/copy-ge
c
os-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch 'f
c
/completion-zs
h
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Me
r
ge branch 'j
k
/
g
i
t
-
c
onnect
i
on-deadlock-fi
x
' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
M
er
g
e b
r
anch 'js
/
maint-send-
p
ac
k
-s
t
ateless-rpc-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge bra
n
ch 'svn-fe-maint' of git
:
//repo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
N
guyen Thai Ng
o
c Duy
init/clone
:
r
e
m
ove short opti
o
n -L and document
--separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J G
r
uber
git-svn:
F
ix git svn log -
-
show
-
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Ha
m
ano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan
N
ieder
p
r
ovide a cop
y
of t
h
e
LGP
L
v
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitpro
x
y configu
r
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
a
f
a
el Gieschke
copy_
g
ecos:
f
ix not
addi
n
g n
l
en to len when
proces
s
ing
"&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
H
amano
Merge branch
'
js/maint-1
.
6
.
6
-
s
e
nd-pack-statele
s
s-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft rel
e
ase 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
mano
Merge branch 'jn
/
ma
i
n
t
-format-pa
t
ch-
d
oc
'
into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge
b
ranch 'ss/cherry-pi
c
k-
x
-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge b
r
anch 'vr/merg
e
-base-
d
oc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch '
s
r/maint-fast-import-tighten-o
p
tion-pa
r
sing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch '
j
c
/t
1
506-shell-para
m
-e
x
pa
n
sio
n
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge
branch 'jc/fix-add
-
u-unmerge
d
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
n
/
gitweb-dependency' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'jc/
m
aint-branch
-
mergeoption
s
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
n
o
Merge branch
'
jc/maint-add-p-
o
verlapping
-
h
unks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Mey
e
r
i
ng
Documentation/gi
t
-fs
c
k
.
txt: fix typo:
u
nreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
sen
d
-pack
:
avoid deadlo
c
k
o
n
git:
/
/
p
u
sh with
fa
i
led
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
connec
t
: le
t
callers
know if connec
t
ion is a so
c
ket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
co
n
nect: treat generic proxy p
r
oces
s
e
s
l
ike
ssh
proce
s
se
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
amano
si
d
eb
a
nd_demux(): fix dec
l
-after-st
m
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
f
f
Kin
g
t3503:
tes
t
cherry pic
k
ing and
reverting root
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
revert: allow revert
i
ng a ro
o
t commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherr
y
-pi
c
k: hand
l
e r
o
ot
commits
with external strate
g
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o C Hamano
Update draft
r
ele
a
se notes
t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C Hamano
Mer
g
e branch
'cn/forma
t
-patch-quiet'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-15
J
un
i
o C Hamano
Merge branch
'j
m
/
m
e
rgetool-sub
m
odules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge bra
n
ch 'jk/f
o
rma
t
-patch-quote-special-in-fro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge br
a
nch 'vh/git-
s
vn-doc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
Hamano
g
it_open_noat
i
me():
d
rop unus
e
d parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_f
i
le: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
ona
t
han
N
ieder
add, merge, diff: do not
use strc
a
s
e
cmp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Prepare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
b
ranch 'aw/maint-rebase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'js/
b
lame
-
par
s
ename' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge
branch 'gr/cvs
i
mp
o
rt-alt
e
rnative-
c
vspas
s
-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Mer
g
e branch
'
j
k
/mer
g
e-one-file-worki
n
g-tre
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Merge b
r
an
c
h
'jc/fix-di
f
f-files-unme
r
ge
d
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Mer
g
e
b
r
anch 'mz/m
a
i
nt-rename-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t
5400:
Fix
a couple o
f
typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hama
n
o
Merge br
a
nch 'jc
/
maint-1
.
7
.
4-path
s
pec-std
i
n-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
M
e
r
g
e branch 'jc/maint-1
.
6
.
6-pathsp
e
c-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Haman
o
setup_revi
s
ion
s
(): take pathspec from
command lin
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Cont
r
eras
git-completion: f
i
x
r
e
gr
e
ssion in zsh support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Joh
a
nnes
S
i
xt
Ho
n
o
r $(pref
i
x)
s
e
t in co
n
fig
.
mak* w
h
en defining ET
C
_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
a
mano
Revert "Honor $
(
p
refix) se
t
in config
.
mak*
w
h
e
n defi
n
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Hamano
t1507: avoi
d
"${para
m
eter<op>'
w
ord
'
}" inside
d
ouble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jun
i
o C Haman
o
t370
1
: add
-
p
-
fix makes the
last test to
p
a
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
akub Narebs
k
i
Remove g
i
tweb/gitweb
.
cgi and other legac
y
targets
f
rom
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ja
k
ub Nareb
s
ki
git-instaweb
:
S
i
mplify b
u
il
d
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 Hama
n
o
m
e
r
ge: make branch
.
<name
>
.
m
ergeopt
i
ons
co
r
rectly overrid
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
B
r
i
t
to
Remo
v
e duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
S
v
er
r
e
Ra
b
b
eli
e
r
fast-import
:
fi
x
option
parser for no-arg opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge br
a
nch 'j
s
/maint-1
.
6
.
6-s
e
nd-pack-st
a
teless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
se
n
d
-
pack:
u
nbrea
k
push o
v
er stateles
s
rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix he
r
e
d
ocu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael J Gruber
g
i
t-fast-import
.
t
x
t: --relati
v
e-mar
k
s takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
S
h
a
r
o
v
shell: ad
d
m
issing i
n
itializa
t
ion
o
f argv0_pa
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhar
d
t
t/
a
nnotate-test
s
: Use echo & cat instead of s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C H
a
mano
Me
r
ge br
a
nch
'
jh/di
r
stat' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
erg
e
branch 'sp/maint
-
clear-postfields
'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Me
r
ge
branch 'jk/maint-stash
-
oo
b
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk
/
maint-
u
pload-p
a
ck-sha
l
low' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Haman
o
Merge
branch 'dm/stash-k-i
-
p' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
Mer
g
e branch 'jc/pac
k
-objects-bi
g
file
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
M
e
rg
e
b
ranch '
m
g/re
f
log-with-options
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hama
n
o
Merge branch '
j
k/stash-loosen-
s
afety' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merg
e
branch
'ar/clea
n
-rmdir-empty'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
Merge branch 'mg/sha1-pat
h
-advis
e
'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Va
l
en
t
in Haenel
g
i
t-add
.
t
xt: d
o
cument 'add
.
ignore
E
rrors'
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
empt
y
file to p4merge where no base is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for pa
s
sword
i
n both
C
VS and CVSNT
p
assword files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file: fix bro
k
en merges with a
l
ternate wor
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Kin
g
a
dd
tests
for me
r
ge-in
d
ex / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p": wo
r
k
-
a
r
oun
d
an
old laziness that do
e
s
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
add--int
e
ractive
.
perl
:
factor
o
ut repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3
7
0
1
:
Editing a split hunk in an "add -p" s
e
ssion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C
Ham
a
no
add
-p
:
'q' sho
u
ld really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
i
o
C
Hamano
Star
t
1
.
7
.
5
.
1 maintenance trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
an
o
Merge branch 'mg/x-years-12-months' into main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain R
a
b
o
t
git-send
-
email:
f
i
x
missing space in erro
r
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
b
l
ame: tolerate bogu
s
e-mail addresses a
bi
t
better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Kacp
e
r
K
ornet
Honor $(prefi
x
) set in config
.
mak* when defi
n
i
ng ETC
_
G
IT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
n
drew Wong
git-rebase--interact
i
ve
.
s
h
: prese
r
v
e-merges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Michael J Gr
u
ber
config
.
txt,diff-options
.
txt: porcelain v
s
.
p
lumbing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next