repo.or.cz
/
git.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-fetch-tighten-refname-check'
2012-09-11
Jun
i
o C Haman
o
b
lame: allow "blam
e
file
"
in the
m
id
d
le of a conflic
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
J
unio C Hamano
Second half
of the fifth batc
h
for 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
J
unio C H
a
mano
Merg
e
branch 'rj/tes
t
-regex'
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Hamano
Merge bra
n
c
h
'jk/
a
rgv-array'
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Me
r
ge branch 'jc/merge-ba
s
es'
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Hamano
Merg
e
bran
c
h 'nd/i1
8
n-
i
ndex-pack'
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
i
o
C
Haman
o
Merge
b
r
a
n
ch 'jc
/
ma
i
nt-
i
den
t
-missing-human-name'
commit
|
commitdiff
|
tree
2012-09-11
Junio C Haman
o
Sync with maint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Ham
a
no
Furth
e
r mergi
n
g down for
1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio
C H
a
man
o
Syn
c
with 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Ha
m
a
no
Merge branch 'js
/
use-sc-open-ma
x
' into
m
aint
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Ham
a
no
Me
r
ge bra
n
c
h
'js/no
-
c
ur
l
-e
a
sy-strerror-on-old-cu
r
l
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
G
it 1
.
7
.
1
1
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
Me
r
ge
b
r
a
n
c
h 'jc/maint-mergeto
o
l-style-fix' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ha
m
ano
Merge
b
ranch 'sz/s
u
bmodu
l
e-force-upd
a
t
e'
i
nto mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merg
e
branch
'
ph/stash-rerere
'
in
t
o
m
aint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge br
a
nch 'jc/maint-s
a
n
e-execvp-notdir' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C
Hamano
Merge br
a
nch 'jc/
m
ai
n
t-config-exit-status'
i
n
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
unio C
Hamano
Merge branch 'mh/maint-config-
d
oc-proxy-co
m
mand' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
unio C H
a
ma
n
o
Merge br
a
nch 'hv/submodule-path-unmatch' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C
H
am
a
no
Merge bran
c
h 'mz/empty
-
rebase-test' i
n
to maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge
branch
'
jk/docs-docbook-mo
n
ospace-display' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C
Hamano
Merge branch 'ab/dif
f
-write-incomplete-line' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
un
i
o
C Hamano
Mer
g
e br
a
n
ch 'jc/main
t
-t7406-rev-parse-max-count-huh
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Hamano
Merge branch 'rr
/
precompose-utf8-cle
a
nu
p
' into maint
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
M
e
rge branch 'jc/capabilit
i
es' into maint
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Hamano
Merge branch '
j
c/doc-git-
u
pda
t
es' into main
t
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge b
r
anch 'jk/check-docs-u
p
date' into maint
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
M
e
rg
e
branch 'tr/
v
oid-d
i
ff-
s
etu
p
-done' into mai
n
t
-
1
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ham
a
no
M
e
rge branch
'tr/merge-recu
r
sive-flush'
into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ham
a
no
Merge branch 'nd/inde
x
-e
r
r
n
o
'
i
n
t
o mai
n
t
-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Mer
g
e branc
h
'pg/maint-apply-remove-unused-variable
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Merge bra
n
ch
'
jc/te
s
t-prereq' into maint
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
blame
$path:
a
void getting foo
l
ed b
y
ca
s
e i
n
sensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Jun
i
o C
H
amano
First half of the fift
h
batch for 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
J
unio C
Hamano
Merge br
a
nch 'c
n
/
branch-
s
e
t
-
u
pstream-to'
commit
|
commitdiff
|
tree
2012-09-10
Junio C H
a
mano
Merge branch 'mz/
c
herry-p
i
ck-cmdl
i
ne-order'
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Mer
g
e bra
n
c
h
'jk/maint-quiet-is-synonym
-
to-s-in
-
log'
commit
|
commitdiff
|
tree
2012-09-10
Junio C Ha
m
ano
Merge bra
n
ch 'ph/cred
e
ntial-gn
o
me-
k
eyring'
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
Ha
m
ano
Cull i
t
ems fixed in m
a
intenanc
e
branc
h
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
S
y
nc with "almost" 1
.
7
.
12
.
1
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
Start p
r
eparing
for 1
.
7
.
1
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C H
a
m
ano
M
erge branch 'bc/pr
u
ne
-
info' in
t
o main
t
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
Me
r
ge
branch 'maint
-
1
.
7
.
11' into maint
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C H
a
mano
Almost 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Ju
n
io C Hamano
Merge
b
ran
c
h '
m
g/rebase-i-
o
n
t
o-reflog-in-full' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
nio C Hamano
Merge branch 'jc/maint-protec
t
-sh-
f
rom-ifs'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Haman
o
Mer
g
e branch 'bc/r
e
ceive-pack-stdout-pr
o
tect
i
on' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C Hama
n
o
Me
r
ge branch
'
jk/mai
n
t-null-in-trees'
i
nto
m
aint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C Hamano
Merg
e
bra
n
ch 'tr
/
m
ain
t
-sen
d
-email-204
7
' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
nio C Hamano
Merge
br
a
nch 'mm/di
e
-with-d
a
shdash-help' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Jun
i
o
C
Hamano
M
e
r
ge branch '
j
s/gitweb-path-info
-
unquote' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Ha
m
ano
gitcli
:
contrast wildcard gi
v
en to shell and to git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Ham
a
no
gi
t
c
li: formatting
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Junio C
H
amano
mailinfo: st
r
ip "RE:
"
prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Junio C H
a
mano
attr: "binary" attribute s
h
ould choose bui
l
t-in "binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Juni
o
C Hamano
merge: teac
h
-Xours/-Xthei
r
s
to binary
l
l-
m
erge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-07
J
u
n
i
o C Hamano
T
h
e f
o
urth batch for
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
M
e
rge branch 'nd/branch-v-align
m
ent'
commit
|
commitdiff
|
tree
2012-09-07
J
u
nio C Hama
n
o
Merge b
r
anch
'jk/ma
i
n
t-http-half-auth
-
push'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hama
n
o
Merge
b
r
anch
'
jc/maint-do
c
-
c
heckout-b-always-takes
.
.
.
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
Merge
bran
c
h 'jc/a
p
p
ly-binary-p0'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
M
e
rge b
r
anc
h
'
jc
/
d
o
tdot-is-parent-direc
t
ory
'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hama
n
o
M
e
rge branch 'nd/i
1
8n-parse
o
pt-h
e
lp
'
commit
|
commitdiff
|
tree
2012-09-07
Junio C
H
amano
Merg
e
br
a
nch 'nd/am-i
1
8n-fix'
commit
|
commitdiff
|
tree
2012-09-07
Jun
i
o C Hamano
Merge b
r
anch 'jk/config-
w
ar
n
-
o
n-ina
c
c
e
ssib
l
e-pa
t
hs'
commit
|
commitdiff
|
tree
2012-09-07
Juni
o
C
H
amano
Merg
e
bra
n
ch 'kk/main
t
-fo
r
-each-re
f
-multi
-
sort'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hama
n
o
Merge branch 'lt
/
c
o
mmit-tre
e
-guess-ut
f
-8'
commit
|
commitdiff
|
tree
2012-09-07
Junio
C Hamano
Me
r
ge branch 'pw/p4-use-client-spec-bra
n
ch-detection'
commit
|
commitdiff
|
tree
2012-09-07
Juni
o
C Haman
o
M
e
r
g
e branch '
t
r/ma
i
nt
-
parse
o
pt-avoid-em
p
ty'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
Merge branch 'nd/i
1
8n-poison-te
s
t-
u
pdates'
commit
|
commitdiff
|
tree
2012-09-04
J
unio C
Hamano
Document f
i
le-glo
b
for
"
git checkout --
'*
.
c
'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
J
unio C Hamano
Update mailma
p
f
o
r
a handful
of fol
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Junio C Hamano
The third batch
f
or 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Junio C
Hamano
Merge branch 'js/use-sc-open-max'
commit
|
commitdiff
|
tree
2012-09-03
J
u
nio C Hamano
M
e
rge br
a
nch 'js/c
o
mpat-mkdir'
commit
|
commitdiff
|
tree
2012-09-03
Ju
n
i
o
C Hamano
Me
r
ge
bra
n
ch 'js/no
-
curl-
e
a
sy-
s
t
r
e
r
ror-on-old-cu
r
l'
commit
|
commitdiff
|
tree
2012-09-03
J
unio C Hamano
Merge bra
n
ch 'jc
/
mai
n
t
-mergetool-style
-
fix'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Hamano
Me
r
ge branc
h
'
s
z/submodule-force-update'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Hamano
M
e
r
g
e br
a
n
c
h 'ph/stash-rerere'
commit
|
commitdiff
|
tree
2012-09-03
Junio
C
Hamano
Merge branch 'jc/daemon-ac
c
ess-h
o
ok'
commit
|
commitdiff
|
tree
2012-09-03
Junio
C Hamano
Merg
e
branch 'jc/send
-
ema
i
l-reco
n
firm'
commit
|
commitdiff
|
tree
2012-09-03
Juni
o
C Hamano
Merge branch '
c
w/cherry-
p
ick-allow-e
m
pt
y
-message'
commit
|
commitdiff
|
tree
2012-09-03
J
unio C Hamano
M
e
rge branch
'jc/maint-s
a
ne-exe
c
vp-
n
otdir'
commit
|
commitdiff
|
tree
2012-09-03
J
unio C
H
amano
Me
r
ge bra
n
c
h
'
j
c/maint
-
config-exit-status
'
commit
|
commitdiff
|
tree
2012-08-31
Ju
n
io C H
a
mano
s
p
lit_i
d
ent_l
i
n
e(): make be
s
t effort whe
n
p
arsi
n
g
a
u
t
hor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Jun
i
o C
H
aman
o
reduce_heads(): reimplement on top of r
e
move_redund
a
nt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio
C Hamano
merge-base: "
-
-is-ancestor A B"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Haman
o
g
e
t_merge_b
a
ses_man
y
()
:
walk from many tips in para
l
lel
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Hamano
in_merge_base
s
():
u
se paint_
d
o
w
n_to_common()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
J
uni
o
C Hamano
merg
e
_bases_
m
a
ny()
:
spl
i
t out th
e
logic to pai
n
t h
i
story
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-29
Juni
o
C
H
amano
Latter half of the sec
o
nd batc
h
f
o
r 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-29
Junio C Ha
m
an
o
M
erge b
r
anch 'rr/pre
c
ompose
-
u
t
f8-cleanu
p
'
commit
|
commitdiff
|
tree
2012-08-29
Junio C H
a
mano
Merge b
r
a
n
ch 'mh/
m
aint-config-doc-proxy-command'
commit
|
commitdiff
|
tree
2012-08-29
J
un
i
o C Hamano
Merge
branch
'ef
/
w
i
n32-cred-helper'
commit
|
commitdiff
|
tree
2012-08-29
J
unio C Hamano
Merge br
a
nch 'hv
/
submodule-path-unmatch'
commit
|
commitdiff
|
tree
2012-08-29
Juni
o
C Hamano
M
e
rge
branc
h
'
jc/capabili
t
ie
s
'
commit
|
commitdiff
|
tree
2012-08-29
J
u
nio C Haman
o
Merge branch '
m
g/rebase-i-onto-
r
ef
l
og-in-full'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hama
n
o
Merge branch 'mz/empty-r
e
base-
t
est'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hamano
Merg
e
branch
'
jc/maint-protect-sh-fr
o
m
-ifs'
commit
|
commitdiff
|
tree
next