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 'jk/blame-line-porcelain'
2011-05-23
Junio C Hamano
Merge branch 'jk/
b
la
m
e-line-p
o
rce
l
a
i
n'
commit
|
commitdiff
|
tree
2011-05-21
Junio C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hamano
Update
d
r
aft release
n
o
tes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C Hamano
Merg
e
branch 'jc/maint-1
.
7
.
4-pa
t
hspec-stdin-and
-
cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Ha
m
ano
Me
r
ge branch 'r
g
/copy-gecos-
u
sername'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hamano
Merge branch 'jl/submodule-c
o
nfl
i
cted-gitmo
d
ules'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge
b
ranch 'jc/replacing'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge
b
ranc
h
'n
d
/sparse-c
o
-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
m
ano
Merge br
a
nch 'ld/
p
4-preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C
Hamano
Merge branch 'ms/
t
agname-do
e
s-not-
b
egin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
man
o
Merge br
a
nc
h
'
jk/git-connect
i
on-deadl
o
ck-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
ge branch 'js/maint-send-pack-st
a
tele
s
s-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'jk/c
h
erry-pick-
r
oot-with-reso
l
ve'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Merge branch 'jc/maint-
p
athspe
c
-
s
tdi
n
-an
d
-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
amano
Merg
e
1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Reve
r
t
"
M
erge branch 'en/merge
-
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
Hamano
Update release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Haman
o
Mer
g
e b
r
anch 'js/maint-1
.
6
.
6-send-pac
k
-
stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
M
er
g
e branc
h
'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merg
e
branch
'
ci
/
comm
i
t--interactive
-
at
o
mic'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o C Hamano
Merge branch 'sg/comp
l
etion-upd
a
t
es'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'kk
/
ma
i
nt-pre
f
ix-in-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
erge branch 'mg/me
r
g
e
-
ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Upda
t
e
d
r
a
ft release
n
o
t
es to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
g
e b
r
a
n
c
h 'jn/maint-format-patch-do
c
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
M
erge b
r
anch 'ss/che
r
r
y-p
i
ck-x-doc'
into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branch 'vr/merg
e
-base-do
c
' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
a
nch 'sr/maint-fast-import-t
i
ghten-opt
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Mer
g
e branc
h
'jc/t1506-shell-param-expansi
o
n-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
M
e
rg
e
bra
n
ch 'jc/fix-a
d
d
-u
-
unme
r
g
e
d
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
M
erge
branch
'
j
n/gitweb-depende
n
c
y' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'jc/maint-branch
-
mergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge br
a
nch 'jc/maint
-
add-p-overlappin
g
-hunks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
si
d
e
b
an
d
_demux(): fix decl
-
a
fter-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C Ha
m
ano
Sy
n
c release n
o
te
s
f
or 1
.
7
.
6
t
o exclude what
are
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge
b
ranc
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
aman
o
Update draf
t
rele
a
se notes 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/format-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
an
o
Mer
g
e branch 'jm/m
e
rgeto
o
l
-subm
o
dules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Ha
m
a
no
Mer
g
e branch 'jk/format-
p
atch-q
u
ote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
Merge branch 'vh/git-svn-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_op
e
n_
n
oatime(): dr
o
p unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
sha1_
f
ile:
t
ypofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C
Hamano
read
_
sha
1
_
f
i
le(): al
l
ow selecti
v
e b
y
passing of r
e
p
lac
e
men
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C Haman
o
inl
i
ne lookup_r
e
place_object()
c
alls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
rea
d
_
s
ha1_file
(
):
g
e
t
r
i
d of
re
a
d_sha1_
f
ile_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
t60
5
0: make sure we test not just commit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Declare looku
p
_replace_obje
c
t() in
c
a
che
.
h,
n
ot in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
U
pdate d
r
aft r
e
l
e
ase notes
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merg
e
br
a
n
c
h 'bf/commit-templ
a
te-no-cleanup
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch '
j
c/
t
1506-
s
h
ell-pa
r
a
m
-expans
i
on-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
ano
Merge branch 'rr/
r
erere-libify-
c
lear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C H
a
mano
Merge branch
'
js/maint-send-pack-s
t
a
te
l
ess-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Merge branch 'jh/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fi
x
-ad
d
-u
-
unme
r
ged'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Haman
o
Merge branch
'jn/setup-revisions-glob-and-friends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
M
e
rg
e
br
a
n
c
h 'cn/log
-
parse-
o
pt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Prepar
e
for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hama
n
o
Merge branch 'a
w
/maint-rebas
e
-i-p-no
-
ff' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Me
r
ge branch
'js/blame-par
s
ename' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch 'gr/cvsimport-alte
r
n
a
t
ive-
c
vspass
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
H
amano
Merge
b
ranch 'cj
/
p4merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
M
erge b
r
an
c
h 'jk/merge-
o
ne
-
file-worki
n
g-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-f
i
les-unmerged'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge br
a
nch 'mz/mai
n
t-rename-
u
nmerg
e
d' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Me
r
ge branch 'nd/struct-pathspe
c
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
Merge bran
c
h 'jc
/
maint-1
.
7
.
4-pathspe
c
-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
ma
n
o
Merge branch 'jc/ma
i
n
t
-1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e branch '
j
c/maint-1
.
6
.
6
-
pathspec-stdin-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
setup_re
v
isions():
take
p
athspec from
c
omman
d
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Ham
a
n
o
Up
d
at
e
draft relea
s
e notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C
Hamano
Merge
branch '
j
n/gitweb-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Hamano
Merge branch 'jc/maint-
b
r
a
nch-me
r
geoption
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
M
e
rge branch 'jn/maint-test-merge-verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bran
c
h 'vh/config-interactive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
jc/ma
i
nt-a
d
d-p-ov
e
rl
a
p
p
ing-hunks'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C H
a
mano
Merge
branch 'sr
/
maint-fast-i
m
port
-
tighten
-
option-pa
r
si
n
g'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
Merge branch
'
dm/htt
p
-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
erge b
r
anch 'j
n
/ctags
'
commit
|
commitdiff
|
tree
2011-05-10
Junio
C Ha
m
ano
Merg
e
branch 'fc
/
completion-
z
sh' int
o
sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Revert "comp
l
etion: don'
t
dec
l
a
r
e
'
local words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
Revert
"
Hono
r
$(prefix
)
set in c
o
nfig
.
mak*
when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert
:
make it ha
r
der t
o
screw up adding a conversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hamano
convert: m
a
ke it sa
f
er to add
c
onver
s
ion attribu
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C Ha
m
ano
convert:
give saner names
t
o crlf/eol
vari
a
bl
e
s,
t
ypes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Hama
n
o
convert: rename the "eo
l
" g
l
obal va
r
i
abl
e
to "c
o
re_eol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
t1507:
a
void "${pa
r
amet
e
r<op>'word'
}
" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ha
m
a
no
t3701
:
add-
p
-fix
m
ake
s
the last te
s
t
to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
r
e
rere: libify rerere_cle
a
r
(
) and
r
erere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
m
er
g
e: int
r
oduce merge
.
ff
c
onfigu
r
ation variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge bran
c
h 'jc
/
m
a
i
nt-bran
c
h-mergeopt
i
o
ns' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C
Ha
m
ano
me
r
ge
:
make bran
c
h
.
<name>
.
mergeoptions corr
e
ctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
man
o
Update draft rel
e
ase notes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
un
i
o C Hamano
Merge
b
ranch 'jn
/
run-command-error-failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Merge branch
'
js/i
n
fo-m
a
n-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merg
e
bra
n
ch 'im/h
a
shc
m
p-optim'
commit
|
commitdiff
|
tree
next