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
Hamano
M
er
g
e
b
ranch 'jc/maint-1
.
7
.
4-
p
a
ths
p
ec-stdin-and-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Merge
branch 'rg/co
p
y
-
gecos-user
n
ame'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hama
n
o
Merge branch
'
j
l
/submodule-con
f
l
i
cted-g
i
t
m
odule
s
'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
i
o
C Hamano
Merge branch '
j
c/replac
i
ng'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hama
n
o
Merge
b
ran
c
h 'nd/s
p
arse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hama
n
o
M
e
rge
b
ra
n
ch 'ld/p4-preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Merge bra
n
c
h
'ms/ta
g
name-does-n
o
t-b
e
gin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C
Hama
n
o
Merge branch 'jk/
g
it-
c
onnection-deadlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
io
C
Hamano
Merge
bran
c
h 'js/maint-send-pa
c
k
-state
l
ess-rp
c
-deadl
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
e
r
g
e branch 'jk/che
r
ry-pi
c
k-
r
o
ot-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Ham
a
no
Merge br
a
nch 'jc/m
a
int-path
s
pec-
s
tdin-and-cmdli
n
e
'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hamano
M
er
g
e 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
a
n
o
Revert "Merge
b
ranch 'en/merge-recurs
i
ve'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Hamano
Up
d
ate rele
a
se notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
io C Hamano
Merge branch 'js
/
m
aint-1
.
6
.
6-send-
p
ack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
amano
M
e
r
g
e
branch 'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'ci/commit--in
t
e
ractive-ato
m
ic'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hama
n
o
Merge branch 'sg/
c
ompletion
-
update
s
'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge
branch 'kk/mai
n
t-prefi
x
-i
n
-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Haman
o
Merge branc
h
'mg/merge-ff
-
config'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
a
mano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
am
a
n
o
Update draft release
n
otes 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 branch 'jn/
m
aint-f
o
rmat-p
a
tch-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C Haman
o
M
e
rge bra
n
ch 'ss/cherry-pick-x-doc
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
e
r
ge branch 'vr/merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'sr
/
m
a
int-fast-import-tighten-o
p
tion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Haman
o
Mer
g
e branch
'jc/t1506-shel
l
-p
a
r
a
m
-exp
a
nsion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch
'jc/
f
ix-add-u-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C H
a
mano
M
e
rge branch
'jn/gitweb-
d
ependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge br
a
nch 'jc/maint-bra
n
c
h-mergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-add-p-over
l
apping-hun
k
s'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C
H
amano
sid
e
ban
d
_dem
u
x
(
): fix de
c
l-after-
s
tmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Sync rel
e
ase
n
otes
for 1
.
7
.
6
to exclu
d
e
what
are
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Hama
n
o
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio 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
Jun
i
o C Ha
m
ano
Me
r
ge branch 'cn/format-pa
t
ch-quiet' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
b
ranch 'jm/mer
g
etoo
l
-submodu
l
es'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C H
a
mano
Merge bra
n
ch 'jk/for
m
at-patch-quote-spe
c
ial-in-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
r
ge branch 'vh/
g
it-svn
-
doc' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ham
a
no
git
_
o
pen_no
a
time(): drop unuse
d
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file: typ
o
fi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read_sha1_file(): a
l
low selectiv
e
bypassing of replacement
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
i
n
li
n
e
l
ookup_replace_obje
c
t() calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
uni
o
C
H
a
mano
r
ead_sha
1
_
f
ile(): ge
t
r
id of read_sha1_f
i
le_re
p
l()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
t6050: m
a
ke sure we test not j
u
s
t
c
o
mmit
r
eplacement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
De
c
lare loo
k
up_rep
l
ace
_
object() in cac
h
e
.
h,
n
o
t in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e bra
n
c
h
'main
t
'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hama
n
o
Up
d
ate draft release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'b
f
/commit-templa
t
e-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Merge branch 'jc/t1506-shell-param-expansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge b
r
anch 'rr/rer
e
re-libif
y
-clear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'js/ma
i
nt-send-pack-stateless-rpc
-
d
eadl
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
M
e
rge bran
c
h 'jh/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge branch 'jc/fix
-
add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Hamano
Merge bra
n
ch 'jn/setup-revisi
o
ns-g
l
ob-and
-
friends-pa
s
sthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge b
r
anch 'cn/log-parse-o
p
t'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch 'm
a
int'
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
Ju
n
i
o
C Hamano
Merge branch 'aw/ma
i
nt-
r
e
base-i-p-no-ff
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
Merge branc
h
'js/blame-parsena
m
e' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o
C Hamano
Merge branch 'gr/cvsimpor
t
-
a
lt
e
rnative-cvspass-locat
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
M
e
rge branch
'cj/p4m
e
rge' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch '
j
k/merge-on
e
-file-w
o
rking-tree' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Mer
g
e bra
n
c
h
'jc/fix-diff-files-un
m
erged' into
maint
commit
|
commitdiff
|
tree
2011-05-13
J
un
i
o
C
H
amano
Merge branch 'mz
/
maint-re
n
ame-unmerged'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
am
a
no
Merge bran
c
h 'nd
/
struct-pathspec
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge br
a
nc
h
'jc/maint-1
.
7
.
4-
p
at
h
sp
e
c-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
ranch 'jc/maint-1
.
6
.
6
-pa
t
hspec-std
i
n-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge br
a
nch 'jc/maint-1
.
6
.
6-pathsp
e
c-
s
tdin-an
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_revisions()
:
tak
e
pathspec from command line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Up
d
ate
dra
f
t release notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge
b
r
a
n
c
h
'jn/
g
i
tweb-dep
e
ndency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
anch 'jc/ma
i
n
t
-bran
c
h-
m
er
g
eopti
o
ns'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Merge bra
n
ch 'jn/maint-test-merge-v
e
rify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ham
a
n
o
Merge branch
'
v
h/config-interac
t
ive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Haman
o
Merge branch
'
j
c
/maint-add-p-overlapping-
h
unks'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Ha
m
ano
Me
r
ge b
r
anch 'sr/maint
-
fast-import-t
i
ghten-op
t
ion-parsi
n
g'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
bra
n
ch 'dm/http-clean
u
p'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
erge branch '
j
n/c
t
ags'
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C
Haman
o
Me
r
ge branch 'f
c
/completion-zsh' into sg/complet
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Ju
n
io C Haman
o
R
e
vert "
c
ompl
e
tion: don't decla
r
e
'
local words' t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Revert "Hono
r
$
(
pre
f
ix) se
t
in config
.
ma
k
* when
defini
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
n
o
convert: make
it harder to s
c
rew u
p
adding a c
o
nversion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Ha
m
ano
convert: make it
safer to add conversion attributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Ham
a
no
c
o
nve
r
t: g
i
ve saner
names to
crl
f
/e
o
l variables,
t
yp
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
convert: rename the "eol"
g
l
o
b
al var
i
abl
e
t
o "core_eol"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
t1507: avoid "
$
{
p
a
r
ameter<o
p
>'word'}" insid
e
d
ou
b
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
t3701: add-p-
f
ix
m
a
k
es
the last test t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io
C
H
a
m
ano
rere
r
e
:
li
b
ify rerere_clear() and rerere_gc(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
ama
n
o
merge:
i
ntroduce m
e
rg
e
.
ff confi
g
urati
o
n variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Haman
o
Me
r
ge branch
'jc/mai
n
t-branch
-
merge
o
ption
s
' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Ha
m
ano
merge: mak
e
b
r
a
n
ch
.
<na
m
e>
.
m
ergeoptions corre
c
tly
o
v
e
rride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Update dra
f
t r
e
lease note
s
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merg
e
b
r
a
n
ch 'jn/run-command-e
r
ror
-
f
a
ilure
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio
C
H
am
a
no
Me
r
ge branch 'js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C
Ham
a
no
M
erge branch 'im/hashcm
p
-optim'
commit
|
commitdiff
|
tree
2011-05-06
J
unio
C Ha
m
ano
Mer
g
e
br
a
nch 'jk/merge-one-f
i
le-working-tr
e
e
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
M
e
r
ge branch 'jc/fix-diff-
f
i
l
es-u
n
me
r
ged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge
branch 'cj/p4mer
g
e'
commit
|
commitdiff
|
tree
next