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
J
u
n
i
o C Hamano
Mer
g
e branch 'kk/maint-pre
f
ix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
ch
'
m
g/diff-uic
o
n
f
i
g-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C Hamano
Merge
branch 'ft/g
i
tweb-tar-wit
h
-g
z
i
p-
n
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge bran
c
h 'ss/doc-svn' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
amano
M
e
rg
e
branc
h
'jn/form
a
t-pat
c
h-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C H
a
mano
M
e
rge bran
c
h 'jc/mai
n
t-pathspec-s
t
d
i
n-and
-
c
mdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'jk/
c
herry-pick-roo
t
-
w
ith-resolve
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Hamano
Merge
b
ranc
h
'rg/c
o
py-g
e
cos-username'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merg
e
branch 'f
c
/completion-zsh' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge branch 'jk/
g
it-connection-deadlock-
f
ix
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'js/m
a
int-sen
d
-pack-sta
t
eless-r
p
c-
d
eadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
m
ano
Me
r
ge branch 'svn-
f
e-maint' of git:/
/
repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Ngu
y
en Thai
Ngoc
D
u
y
init/c
l
one
:
r
emove short option -
L
and d
o
cument --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Mic
h
ael
J
Gruber
git-svn: Fix
git svn
log
-
-sh
o
w-
c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
unio 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 Nieder
p
r
ovide a copy of t
h
e LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff Ki
n
g
test core
.
gitproxy configu
r
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
afael Gieschke
copy_
g
e
cos: f
i
x not ad
d
ing nlen to len
when processing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
Hamano
Merge branch
'
js/maint-
1
.
6
.
6-send-pack-stateless-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
Update d
r
aft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge
b
ranch 'jn/maint
-
f
ormat-patch-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
Ha
m
ano
Merge branch
'ss/cherry-pick-x-doc' i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
amano
Merg
e
branch 'vr/
m
erge-b
a
se-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge branch 'sr/ma
i
nt-fast-import
-
tighten-option
-
pars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erg
e
branch 'j
c
/
t
1506-shel
l
-param-
e
xpansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge bra
n
ch
'
j
c
/fix-add-u-unmerged'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C
Hamano
Merge bra
n
c
h
'j
n
/gitweb-depend
e
n
cy' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'jc/m
a
int-b
r
anch-mergeoptions' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branc
h
'jc/maint-add
-
p-overlappi
n
g-hu
n
ks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Docume
n
tation
/
git-fsck
.
t
x
t: f
i
x
t
ypo: unre
a
d
a
ble -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
s
e
nd-pac
k
:
a
void dead
l
ock o
n
g
it://
push with
f
ailed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
connect: let cal
l
ers
k
n
ow if connection
i
s a socke
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
conn
e
c
t
: treat generic
p
r
oxy processes like ssh
p
r
ocesses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
s
ideban
d
_demu
x
(): fix decl-af
t
er-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
eff Ki
n
g
t3503
:
t
est c
h
erry picking and
revert
i
ng roo
t
commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: allow reverting a roo
t
c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
che
r
ry-pick:
h
and
l
e
r
o
ot commits with external
strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio 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 H
a
mano
Merg
e
branc
h
'
c
n
/
format-patc
h
-quiet
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e
b
ranch
'jm/mergetool-subm
o
dules'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
erg
e
branch 'jk/format-patch-quote
-
special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
erge branch
'
vh/git-
s
v
n-
d
oc' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_noatime():
dro
p
u
nused
p
arameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
H
amano
sha1_file
:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nied
e
r
add, merge, d
i
ff: do not use str
c
a
secmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'a
w
/maint-reb
a
se-i-p-no-
f
f' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
a
no
M
e
rge bra
n
ch 'js/blame-
p
arsename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
amano
Merg
e
b
r
anch 'gr/cvsimport-alternative-cvspas
s
-locati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
r
ge branc
h
'cj/
p
4m
e
rge'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jk/merge
-
one-fi
l
e-wo
r
ki
n
g-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branc
h
'
jc
/
fix-di
f
f
-files-
u
nmerged' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Mer
g
e branc
h
'
mz/
m
aint-r
e
na
m
e
-unmerge
d
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herlan
d
t5400: F
i
x a
couple of ty
p
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
Merge branch 'jc/
m
aint-1
.
7
.
4-paths
p
ec-stdin-a
n
d-
c
md
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C
H
amano
M
erge b
r
anch
'
j
c
/m
a
int-1
.
6
.
6-pathspe
c
-stdin-and-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ha
m
ano
set
u
p_revisions(): take pathspec f
r
om c
o
mman
d
line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe
C
ontrer
a
s
gi
t
-completion: fix
regression in z
s
h su
p
port
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Johannes Sixt
Honor $(prefi
x
) set in
c
onfig
.
mak* when defining ETC_G
I
T
*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hamano
R
e
vert "Honor $(prefix) s
e
t
i
n
co
n
fig
.
mak* when
defi
n
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio
C H
a
man
o
t1507
:
avoid "${parameter<op>'
w
o
r
d
'}" i
n
side double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio C Haman
o
t3
7
01
:
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 Narebski
R
emo
v
e gitweb/gitweb
.
c
g
i and other legac
y
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-instaweb: Simplify build dependency o
n
gitweb
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
Hamano
m
e
rge: m
a
ke bra
n
ch
.
<name>
.
me
r
geop
t
ion
s
c
o
r
r
ectly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ão
B
ritto
R
emove duplic
a
ted "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
S
v
erre Rabb
e
l
i
er
fast-imp
o
rt: f
i
x op
t
ion parser for n
o
-
arg optio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C H
a
mano
Merge
b
ranch 'j
s
/maint-1
.
6
.
6-send-pack
-
stat
e
less-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Je
f
f K
i
ng
s
end-pack: un
b
r
e
ak push over st
a
t
e
less rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here docume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mich
a
el J
G
r
u
ber
gi
t
-fast-import
.
txt: --relative-marks takes no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
i
ma Sharov
shell:
a
dd missi
n
g initi
a
liza
t
ion of argv0
_
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian
Gernhardt
t
/annota
t
e
-tests: Use ec
h
o & cat instead of
s
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
a
mano
Merge br
a
nch 'jh/dirstat' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Mer
g
e
b
r
a
nch 'sp/ma
i
nt-clear-p
o
s
tfields' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'jk/maint-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk
/
maint-upload-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
e
rge br
a
nch '
d
m
/
stash-k-i-p' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch
'
jc/pack-objects
-
bigfile' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
a
n
o
Merge
b
r
a
nch 'mg/ref
l
og-w
i
th-
o
p
t
ions' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'jk/s
t
a
sh-loosen-safet
y
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge bran
c
h 'ar/clean-rmd
i
r-empty'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Me
r
ge branch 'mg/sha1
-
path
-
ad
v
ise'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
t
x
t
:
d
o
cumen
t
'add
.
ignoreErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n Jessup
Pas
s
empty fil
e
to p4merge where no b
a
se is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y Rouillier
L
ook for passwo
r
d in both CVS and CVSNT pas
s
word file
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
erge
-
one-fi
l
e
: fix broken mer
g
es with
alt
e
rn
a
te work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f
K
ing
add t
e
sts for merge-index
/ merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"
a
dd -p":
w
ork-around an o
l
d l
a
zi
n
ess that do
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--interactive
.
perl: factor out repeated --reco
u
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
io
C
Hamano
t
3
7
0
1
:
Editing 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 Hamano
add
-
p: 'q'
s
hould real
l
y
quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Start 1
.
7
.
5
.
1
m
a
intena
n
c
e
t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Merg
e
branch 'mg
/
x-year
s
-12-
m
onths' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-emai
l
: fix mi
s
sing space in e
r
ror m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Ston
e
blame: tolerate b
o
gus
e
-
m
ail
a
ddresses a bit bett
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Kac
p
er Kornet
Hon
o
r $(prefix) set in con
f
i
g
.
mak* wh
e
n
d
ef
i
ning ETC_GI
T
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew W
o
n
g
git-
r
ebas
e
--interactive
.
s
h: preserve-me
r
ges fa
i
ls on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Mi
c
hael
J
Gruber
config
.
txt,diff-option
s
.
txt: porce
l
ain vs
.
plumbing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next