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 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20
Junio
C
H
ama
n
o
Merge bra
n
ch 'jc/maint-1
.
7
.
4-pathspec-std
i
n-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merg
e
br
a
n
ch 'rg/copy-gec
o
s-
u
sername
'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Merg
e
branch 'j
l
/submodule-c
o
n
flicted-gitmodules'
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o
C
H
amano
Merge branch 'jc/repla
c
ing'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
H
amano
Merge branch 'nd/sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
J
uni
o
C H
a
mano
Merge branch
'
ld/p4-preserve
-
user-names'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Merge
b
r
anch 'ms/
t
agn
a
me-does-
n
ot-
b
egin-
w
ith-d
a
s
h'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Merge b
r
a
nch 'j
k
/git
-
connec
t
ion
-
deadlock-f
i
x'
commit
|
commitdiff
|
tree
2011-05-20
J
uni
o
C Hama
n
o
M
erge branch 'js/maint-send-pack-statele
s
s-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hama
n
o
M
erge branch 'jk/c
h
erry-
p
ick-root-wi
t
h-reso
l
v
e'
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
ma
n
o
Merge bra
n
ch 'jc/maint
-
p
a
t
h
s
p
ec-stdin
-
and-cmd
l
i
ne'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Merge 1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Revert "Merge branch 'en/
m
erge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Ha
m
a
no
Update release not
e
s t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
unio C Ha
m
ano
Merge branc
h
'js/maint-1
.
6
.
6-send
-
pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hama
n
o
Merge
bra
n
ch 'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branch
'ci/commi
t
-
-in
t
er
a
cti
v
e
-
a
t
omic'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
m
a
no
Merge
b
ranch 'sg/completion-
u
pda
t
es'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge
branch 'kk/
m
aint
-
pre
f
ix-in
-
confi
g
-mak'
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C
H
a
mano
Merge
b
ranch
'mg/merge-ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update dra
f
t relea
s
e
n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
n
/ma
i
nt-format-
p
atch-doc' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
H
amano
Merge
b
ranch 's
s
/ch
e
r
r
y-pick-x-
d
oc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'vr/m
e
rge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'sr/maint
-
fa
s
t-impor
t
-
t
ighten-optio
n
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch
'
jc/t1506-she
l
l
-
param-ex
p
ansio
n
-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merg
e
bran
c
h 'jc/
f
ix-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge
bran
c
h 'jn/gitweb-dependency' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hama
n
o
M
e
rge branch 'j
c
/maint
-
br
a
nch-
m
er
g
eopti
o
ns' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hama
n
o
M
e
rge branc
h
'
jc/maint-add-p-overlapping-hunks' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
si
d
eb
a
nd_demux(): fix decl-aft
e
r
-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
a
m
a
n
o
S
y
nc
rel
e
ase notes
for 1
.
7
.
6
to ex
c
lude w
h
at are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
m
a
n
o
Update
d
r
a
ft r
e
lease n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
n
o
Merge branch 'cn/format-patch-quiet' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Ha
m
ano
M
erge branch 'jm/merge
t
ool
-
submodules' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jk/format
-
pa
t
c
h
-
quote
-
spec
i
a
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
man
o
Merge branch '
v
h/git-svn-doc' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
git_open_noatime():
d
rop
unused p
a
rameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Ham
a
no
sha1_file: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
ma
n
o
read_s
h
a1_file
(
): allow selecti
v
e
bypas
s
ing of
r
epla
c
ement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
inline lookup_replace_object() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
r
ead_sha1_fil
e
(
)
: get rid of
r
ead_sha
1
_
f
i
le_rep
l
()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
Hamano
t6
0
50: make sure we
t
est n
o
t
j
ust commit r
e
placement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Declare
l
o
o
k
up_replace_object() in cache
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ha
m
ano
Me
r
ge br
a
nch
'
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C Hama
n
o
Update draft re
l
ea
s
e notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Me
r
ge branch 'bf/commit-templ
a
te-no
-
cleanu
p
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/t1506
-
s
h
ell-param-expansion
-
gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
no
Merge
b
ranch
'
rr/rerere
-
libify-clear
-
g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
M
e
rge branch 'js/m
a
int-
s
end-pack-
s
ta
t
eless-rpc-dea
d
lo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C H
a
mano
Merge
b
ranch 'jh/dirs
t
at-
l
ines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
n
o
Merge branch 'jc/f
i
x
-
add-u-
u
n
mer
g
e
d
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jn/se
t
up-revisions-g
l
ob
-
and-friends
-
p
a
ssthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
r
a
nch '
c
n/log-p
a
rs
e
-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
H
amano
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
H
amano
Merge branch 'a
w
/maint-rebase-i
-
p-no-ff'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'j
s
/blame-parsename
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
H
a
mano
Me
r
g
e branch 'gr/c
v
sim
p
o
rt-altern
a
ti
v
e-cvspa
s
s-loc
a
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
r
a
nc
h
'j
k
/merge-one-file
-
w
orking-tree'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
a
m
ano
M
e
r
ge
b
r
anch 'jc
/
fix-dif
f
-
f
il
e
s-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch
'mz/maint
-
rename-unmerg
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
erge b
r
anc
h
'
nd/st
r
uct-pa
t
hs
p
ec'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
Mer
g
e
b
ranch 'jc/ma
i
nt-
1
.
7
.
4-pathsp
e
c-s
t
din-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch 'jc/maint-1
.
6
.
6-pathspec-stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
Ha
m
ano
Merge branch 'jc/maint-1
.
6
.
6-pa
t
hspec
-
stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o C Hamano
setup
_
rev
i
s
ions(): ta
k
e pathspec from
co
m
mand line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
un
i
o
C
Haman
o
Update
draft release
notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io C
H
amano
Merge
branch 'jn/gitweb-dependency
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
anch 'jc/maint-branch-mergeoptio
n
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Haman
o
M
erge bra
n
ch 'jn/mai
n
t-te
s
t-m
e
rg
e
-ver
i
fy
-
paren
t
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merg
e
bran
c
h 'vh/config-inte
r
ac
t
ive-
s
i
nglekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o
C
Hamano
Merge branch 'jc/maint-add
-
p-
o
ve
r
lapp
i
ng-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
br
a
nch 'sr/maint-fas
t
-import-tigh
t
en-opti
o
n
-
parsi
n
g'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Me
r
ge
b
ran
c
h 'dm/htt
p
-cl
e
a
n
up'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o C H
a
mano
Merge branc
h
'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-10
Junio C
Haman
o
Mer
g
e bran
c
h
'f
c
/
c
ompletion
-
zsh'
into
sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
J
u
nio C Hamano
R
e
vert
"c
o
mpletion: don't declare
'loca
l
words'
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Revert
"
Honor $(prefix
)
set in co
n
fig
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio
C
Hamano
c
o
n
ve
r
t:
make it harder to
sc
r
ew up ad
d
in
g
a conversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C H
a
ma
n
o
convert:
make it s
a
fer to add conversion
attri
b
u
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
n
io C Ha
m
a
n
o
c
o
nvert: g
i
v
e
saner names
t
o crlf/eol variables, typ
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio
C
Haman
o
c
onver
t
:
rename the
"
eol
"
global
variable to "
c
o
re_eol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
i
o
C Hama
n
o
t1507: avoid "${parame
t
e
r
<op>
'
w
o
rd'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t
3701:
add-p-fix m
a
kes the last
test
to
p
ass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
unio
C
Hamano
rerere: libify rerere_cl
e
ar() and rerere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
mano
mer
g
e
: intro
d
uce merg
e
.
ff configuration var
i
abl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C H
a
m
a
no
Merge
b
ra
n
ch 'jc/
m
aint-bra
n
ch-mergeoptions' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hamano
me
r
g
e
: m
a
ke
branch
.
<name>
.
mergeo
p
ti
o
ns
c
orrectly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Up
d
ate d
r
aft r
e
lea
s
e notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
M
erge b
r
anch 'jn/run-command-error-failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
erge branch 'js/info-
m
an-p
a
th'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio
C
Ha
m
a
n
o
Merge b
r
an
c
h 'im/hash
c
mp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anc
h
'j
k
/merg
e
-
o
ne-f
i
le-working-tree
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge branch '
j
c
/fix-diff-
f
iles-un
m
erged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
Merge branch '
c
j/p4merge'
commit
|
commitdiff
|
tree
next