repo.or.cz
/
git
/
mingw
/
j6t.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/ll-merge-binary-ours' into maint
2012-10-17
Junio C H
a
m
a
no
M
e
r
ge bran
c
h 'jc/ll-merge-binary-ours' in
t
o maint
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C
Haman
o
Mer
g
e bra
n
ch 'db/doc-custom-x
m
l
t
o
' into maint
commit
|
commitdiff
|
tree
2012-10-09
Jun
i
o C Hamano
Merge branch 'maint' of g
i
t://github
.
co
m
/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
G
it 1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
Junio C Haman
o
Merge branch
'os/
c
om
m
i
t
-su
b
modu
l
e-
i
gnore' into
m
aint
commit
|
commitdiff
|
tree
2012-10-08
J
u
nio C Hamano
Mer
g
e branch
'
jk
/
receive-pack-unpack-e
r
ror-to-pusher
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Jun
i
o C Hamano
Merge branch 'rt/mai
n
t-clone-s
i
ngle
'
into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C
H
a
man
o
M
er
g
e bra
n
ch '
j
c
/blame-
f
ollows-renames'
into
m
aint
commit
|
commitdiff
|
tree
2012-10-08
Junio
C Hama
n
o
Merge branch 'lt/mailinfo-hand
l
e
-
attac
h
ment-more-sanely
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hama
n
o
S
tart prepa
r
ing
for 1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
Junio C
Hamano
Merge branch 'rr/maint-submodul
e
-unknown-cmd
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Ju
n
io C Ha
m
ano
Merge branch 'sp
/
mai
n
t-http
-
ena
b
le-gzip' int
o
maint
commit
|
commitdiff
|
tree
2012-10-02
Junio C Hamano
Merge branch 'sp/m
a
i
n
t
-
ht
t
p
-
i
nfo-refs-no-ret
r
y'
into
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
J
unio C Haman
o
Git 1
.
7
.
1
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge b
r
a
n
c
h 'ma
i
nt'
of git
:
//
g
ithub
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Ju
n
io C Haman
o
Merge
branch
'
jc/maint-
l
og-
g
r
ep-all
-
ma
t
c
h-1' int
o
maint
commit
|
commitdiff
|
tree
2012-09-30
Junio C
Hamano
Merge branch 'j
c
/maint
-
mailin
f
o-mime-attr' into maint
commit
|
commitdiff
|
tree
2012-09-24
Junio C Hamano
Start preparation for 1
.
7
.
12
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-24
Junio C Hamano
Merge br
a
n
c
h
'jc/maint-b
l
am
e
-no-s
u
c
h
-path'
i
nto maint
commit
|
commitdiff
|
tree
2012-09-24
Junio C Hamano
Merg
e
b
r
anch
'
d
j/fetch
-
all-tag
s
' into maint
commit
|
commitdiff
|
tree
2012-09-21
J
unio
C Hamano
g
i
t blame
:
doc
u
ment
t
hat it
a
lways
follows
o
rigin
across
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-20
J
u
n
i
o C Ha
m
ano
M
erge br
a
nc
h
'nd/maint-dif
f
stat-su
m
mary' into maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merg
e
branch
'
jw/doc-c
o
mmit-title' into maint
commit
|
commitdiff
|
tree
2012-09-20
J
u
n
i
o
C
Haman
o
Merge
b
r
a
nch
'dg/
r
un-command-
c
hild-cleanup'
into
ma
i
nt
commit
|
commitdiff
|
tree
2012-09-20
Junio
C
H
a
mano
Merge branch
'jc/mail
i
nfo-RE' i
n
to maint
commit
|
commitdiff
|
tree
2012-09-20
Ju
n
io C Haman
o
Merge branch 'sn/ls-remote-get
-
url-d
o
c' into maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merge branch 'nd/log
-
n
-
doc' into maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merge bra
n
ch 'nd/maint-remote-remove
'
into
mai
n
t
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
grep
.
c
:
m
a
ke t
w
o symbols really file-scope static
t
his
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
G
it 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-18
Ju
n
io C Ham
a
n
o
Merge branch 'er/
d
oc-fas
t
-i
m
p
ort-
d
one
'
into maint
commit
|
commitdiff
|
tree
2012-09-18
Jun
i
o C Hamano
Merge br
a
nch 'jk/confi
g
-
w
arn-on-in
a
ccessible-paths
.
.
.
commit
|
commitdiff
|
tree
2012-09-17
Junio
C
H
a
mano
mailinfo: do
n
o
t
conca
t
enate
cha
r
s
et= attribute values
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-16
J
u
ni
o
C Ha
m
ano
g
rep
.
c: mark p
r
ivate fil
e
-s
c
ope symbols
as static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
J
unio C Hamano
Draft releas
e
n
ote
s
to 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
J
unio
C H
a
mano
M
e
r
g
e b
r
anch 'sb/send-email-reconfirm-fix' into main
t
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Mer
g
e bran
c
h 'jc/send-
e
m
a
il
-
reconfirm' into maint
commit
|
commitdiff
|
tree
2012-09-15
Junio C Ha
m
a
n
o
Merge branch
'
m
z/c
h
erry-pi
c
k-cmdline-or
d
er
'
into m
a
int
commit
|
commitdiff
|
tree
2012-09-15
Junio C
Ham
a
n
o
Sync w
i
th 1
.
7
.
11
.
7
commit
|
commitdiff
|
tree
2012-09-15
Junio C
H
amano
Git 1
.
7
.
11
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Mer
g
e bran
c
h 'jk/maint-
q
ui
e
t-is
-
syno
n
y
m
-
t
o-s-in-lo
g
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C Ham
a
no
M
erge branch 'j
c
/maint-
i
den
t
-missing-hu
m
an-na
m
e'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C Haman
o
Merge
branch
'rj/test-regex' into
m
a
int-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-15
Juni
o
C Hamano
M
erg
e
b
r
a
nch
'da/gitk-re
l
oad-
t
ag-
c
ontents' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
J
unio C H
a
mano
Merge
branc
h
'jc/m
a
i
nt-chec
k
ou
t
-
filegl
o
b-doc' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-14
Junio C
Hamano
log: docum
e
nt use of mult
i
ple comm
i
t
l
i
mi
t
ing options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Juni
o
C H
a
mano
log -
-
gr
e
p/--au
t
hor: honor --all-matc
h
honored f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Junio C H
a
mano
grep: tea
c
h --de
b
ug option
to dum
p
the parse tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
attr: f
a
ilure to open a
.
gitattribu
t
es file
is OK
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
J
u
nio C
H
amano
F
ur
t
h
e
r merging in preparation
f
or 1
.
7
.
1
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Junio C Ha
m
a
n
o
Merge
bran
c
h 'maint-1
.
7
.
11' into maint
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C H
a
man
o
Merge
b
ranch 'jc/apply
-
binary-p
0
' into ma
i
nt-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-12
J
u
nio
C
Hamano
M
erge
b
ranch 'jc/dot
d
o
t-is-parent-direc
t
or
y
' int
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Ju
n
io C Hamano
Merge branch 'jc/maint-doc-chec
k
out-b-always-takes
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
J
u
nio
C Hamano
Mer
g
e branch 'j
k
/
m
aint-ht
t
p-half
-
aut
h
-push' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merge
b
r
a
nch 'k
k
/maint-for-
e
ach-ref-multi-sort
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
J
unio
C
Hamano
ll-merge: warn
a
b
o
u
t inability
to merge bina
r
y
files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ha
m
ano
b
l
ame: allow "blam
e
file" i
n
the middle of a co
n
flicted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Further mergi
n
g down for 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Hamano
Sync with 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io
C Ha
m
ano
M
e
rge branch
'
js/use
-
sc
-
open-max' into maint
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge branch 'js/no-c
u
rl-easy-strerror-on
-
old-curl
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C H
a
mano
Git 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Hamano
M
e
rg
e
branch 'jc/maint-mergetool-s
t
yle-fix' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
M
e
rge
b
r
anch 'sz/subm
o
d
u
le-force-upda
t
e'
i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
M
e
rge branch 'ph/st
a
sh
-
r
er
e
re' into maint-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Haman
o
Merge branch 'jc/maint-sa
n
e-execvp
-
notdir' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C
H
amano
M
e
r
g
e
branch
'
jc/maint-confi
g
-exit-status' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C H
a
mano
Merge b
r
anc
h
'mh/maint-config-do
c
-proxy
-
command' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Ham
a
no
M
e
rge
b
ranch 'hv/submodule-path-unmat
c
h
' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge b
r
anch 'mz
/
empty-rebase-test' i
n
to main
t
-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Hamano
Merg
e
branc
h
'jk/do
c
s-docbook-monospa
c
e-displ
a
y
' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
Merg
e
br
a
nch
'ab/di
f
f
-wri
t
e-incomp
l
e
t
e-
l
ine' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ham
a
no
Merge branch 'j
c
/
m
aint-t7406-rev-pars
e
-
m
ax
-
c
o
unt-huh
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Hamano
Me
r
ge branch
'
rr/precompose-utf8-cl
e
anu
p
' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
H
amano
Merge br
a
nch 'jc/capabilities' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Hamano
M
e
rge branch '
j
c/doc
-
git-up
d
a
t
e
s' into maint
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge
b
ranch 'jk/check-docs-update' into maint
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io
C Hamano
Merge branch
'
tr/vo
i
d-di
f
f-setup
-
done' into maint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Hamano
Mer
g
e
bra
n
ch 'tr
/
me
r
g
e
-
r
ecursive-
f
lush' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
Merge bran
c
h
'
nd/index-e
r
rno' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Merge branch
'
p
g
/maint-
a
pply-
r
emove-
u
nused-va
r
iab
l
e
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
i
o
C Hamano
Merge bran
c
h 'jc
/
test
-
p
r
ereq' into ma
i
nt
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
b
lam
e
$path: avoid getting fooled
by case
insen
s
itive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
S
tart preparing for 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
Ha
m
ano
Merge
branch 'bc/prune
-
inf
o
'
into maint
commit
|
commitdiff
|
tree
2012-09-10
Junio C Ham
a
no
M
er
g
e
b
r
a
nch 'ma
i
nt-1
.
7
.
11'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C
H
amano
A
lm
o
st 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Hamano
Merg
e
branch
'mg/rebase-i-onto-reflog-in
-
fu
l
l' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Jun
i
o C
H
amano
Mer
g
e branch 'jc/m
a
i
nt-protec
t
-sh-from-
i
fs' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
H
amano
Merge branc
h
'
bc/receive-pack-
s
tdout-protec
t
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Hamano
Merge bra
n
c
h
'jk/maint
-
null-in-trees'
int
o
maint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Me
r
ge branch 'tr/maint-
s
e
n
d
-
e
m
ail-2047' in
t
o m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C Hamano
Merge bra
n
ch 'mm/die-with-dashdash-help' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Hamano
M
e
r
ge bra
n
ch
'
j
s
/gitweb-path-in
f
o-unquote'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
gi
t
cli: con
t
rast wil
d
card given to sh
e
ll
and
to git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
gi
t
cli: formatti
n
g
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Junio
C Ha
m
ano
mai
l
i
nfo:
s
tri
p
"RE: "
p
r
e
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
J
unio
C Hamano
attr
:
"
b
inary" attribute
s
hould
c
hoose b
u
ilt-in "
b
inary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Junio C Hamano
merge: teach -Xours/-Xtheirs t
o
b
i
nary ll-me
r
ge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next