repo.or.cz
/
git
/
jrn.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 Ha
m
a
n
o
Merge br
a
nch 'jc
/
ll-merg
e
-binary-ours' in
t
o
maint
commit
|
commitdiff
|
tree
2012-10-17
Juni
o
C Hamano
Merge branch 'db/doc-cu
s
t
om-xml
t
o'
i
n
to maint
commit
|
commitdiff
|
tree
2012-10-09
Junio C Hamano
Merge branch 'maint' of
g
it:
/
/github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
J
unio
C Hamano
Git 1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-08
Junio
C
Hamano
Merge branch 'os/commit-submodul
e
-igno
r
e' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge b
r
a
n
c
h 'jk/receive-
p
ack
-
unpack-error-t
o
-pus
h
e
r
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Me
r
ge branch
'
rt/maint-clone-sing
l
e' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C
Hamano
Merge branch 'jc/bl
a
me-follows-ren
a
me
s
' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C
H
amano
Merge branch 'lt/mai
l
info-handl
e
-attachment
-
more-sanely
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
J
u
nio C Ha
m
ano
Start preparing for 1
.
7
.
12
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-10-02
Jun
i
o
C
Ha
m
ano
Merge bra
n
ch 'rr/m
a
int-submodu
l
e-unknown-cmd' into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Juni
o
C Hamano
Merge br
a
n
c
h
'sp/maint-http-
e
nable-gzip'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-10-02
Ju
n
io
C Hamano
M
erge
b
ranc
h
'sp/main
t
-http-i
n
fo-r
e
fs
-
no-r
e
tr
y
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C
H
ama
n
o
Git 1
.
7
.
12
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-30
Junio C H
a
mano
Merge bra
n
ch 'maint' of
g
it://github
.
com/g
i
t-l10n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C Ham
a
no
Merge bra
n
c
h 'jc/ma
i
nt-log
-
grep
-
all-match-1' into
m
aint
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge branch 'jc
/
maint-
m
aili
n
fo-mime-att
r
'
into m
a
int
commit
|
commitdiff
|
tree
2012-09-24
Juni
o
C
H
amano
Start pr
e
p
a
r
ation for 1
.
7
.
12
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-24
J
unio C Hamano
Me
r
g
e
branc
h
'jc
/
m
ai
n
t-bla
m
e-no-s
u
ch-path' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-09-24
Junio
C Haman
o
Me
r
g
e
bran
c
h '
d
j
/
fetch-all-tags'
into
m
aint
commit
|
commitdiff
|
tree
2012-09-21
J
u
nio C Hamano
g
it blame: doc
u
ment that it always follows ori
g
in across
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-20
Junio
C
Ha
m
a
no
Merge bra
n
ch 'nd/maint-diffstat-summary' into maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merge branc
h
'j
w
/doc-c
o
mmit-title' into
m
ain
t
commit
|
commitdiff
|
tree
2012-09-20
Junio C H
a
m
a
no
Merge branch 'dg/ru
n
-
c
om
m
and-child-cleanup'
into maint
commit
|
commitdiff
|
tree
2012-09-20
Jun
i
o C Hamano
M
erge branch
'
jc/ma
i
l
info-
R
E' int
o
maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merg
e
br
a
n
c
h
'
sn/ls-remote-g
e
t-url-doc' into maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merge branch 'nd/
l
og-n-doc' into
maint
commit
|
commitdiff
|
tree
2012-09-20
J
unio
C Hamano
Merge b
r
anch
'nd/maint-remote
-
re
m
ov
e
' into mai
n
t
commit
|
commitdiff
|
tree
2012-09-20
J
unio C Hamano
grep
.
c: mak
e
two sy
m
b
o
l
s reall
y
f
i
le-scop
e
static this
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-18
J
unio C Hama
n
o
Git 1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
Merge bran
c
h 'er/
d
oc-fast
-
im
p
ort-done' into mai
n
t
commit
|
commitdiff
|
tree
2012-09-18
Junio C Ha
m
ano
M
e
r
ge branch 'jk/config-warn-o
n
-in
a
c
c
essible-paths
.
.
.
commit
|
commitdiff
|
tree
2012-09-17
J
unio C H
a
mano
mailinfo: do not concatenat
e
c
h
arset= att
r
ibute values
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-16
Junio C Hamano
grep
.
c: mark
private fi
l
e-scope symbo
l
s as s
t
ati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-15
J
unio C Hamano
D
r
aft r
e
le
a
se no
t
es to 1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-15
Jun
i
o
C
Hamano
Merge branch 'sb
/
s
end-email-r
e
confir
m
-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
M
erge branch
'
j
c/send-email-re
c
onfi
r
m' into
maint
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Merge branch
'mz/cherry-pick-cmdline-order' into maint
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Sync with 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
Ju
n
io C Hamano
Merge branch 'jk/maint-qui
e
t-is-synonym-to-s-in-log
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
J
unio C Hamano
Merge branch '
j
c/main
t
-id
e
nt-miss
i
ng-h
u
m
a
n-n
a
m
e' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Ju
n
io C Hamano
M
er
g
e branch
'rj/test-reg
e
x' into maint-
1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-09-15
Jun
i
o
C Ham
a
no
Merge branch
'
da/gitk-r
e
load
-
t
ag-contents'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Ju
n
io C H
a
mano
M
er
g
e br
a
n
c
h
'jc/maint-che
c
kout-fileglob-doc'
into
.
.
.
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
log: do
c
ument u
s
e
o
f multiple
c
o
m
mit limiting options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Junio C
H
ama
n
o
lo
g
--gr
e
p/--auth
o
r:
h
onor --all-m
a
tch honored for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Junio
C Hamano
grep: te
a
c
h
--debug o
p
tion t
o
d
u
mp the
parse t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Junio C Ham
a
no
at
t
r:
fai
l
ure to open a
.
gitattr
i
b
u
tes fi
l
e is OK
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
F
u
rther me
r
g
ing in preparat
i
on for
1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C
Hamano
Merge b
r
anch 'm
a
int-
1
.
7
.
11' into main
t
commit
|
commitdiff
|
tree
2012-09-12
Junio C Haman
o
Merge bra
n
ch '
j
c/apply-binary-p
0
'
i
nto m
a
int-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-12
Ju
n
io
C
Hamano
Merge b
r
an
c
h 'jc/dotdot-is-pa
r
ent-direct
o
r
y
'
i
n
to
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio C
H
am
a
no
Merge bran
c
h '
j
c/
m
aint-do
c
-ch
e
ckout-b-always-tak
e
s
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o
C Hamano
Merg
e
branc
h
'jk/maint
-
http-half
-
auth-push' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
J
unio C Hamano
Merge branc
h
'kk/maint-fo
r
-each-ref-mul
t
i-sort' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
ll-merge: warn abou
t
ina
b
ility to merg
e
b
i
nary fi
l
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Haman
o
blame: a
l
l
ow "blame file" in the middle of a confl
i
cted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
F
u
r
t
h
e
r merging dow
n
fo
r
1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
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
Junio
C Hamano
Merge
b
ran
c
h 'js/use-sc
-
open-max'
into maint
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
i
o
C
H
amano
M
erge branch
'
js/no-
c
url-eas
y
-strerro
r
-on-old-cur
l
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C H
a
mano
Gi
t
1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C
Hamano
Merge
b
r
a
nch 'jc/maint-merge
t
ool-style-fix' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C H
a
mano
Merge
branch 'sz
/
submodule-force-update' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C
Haman
o
Merge
b
r
a
nch 'ph/stash-rerere'
i
nto main
t
-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
Merge bran
c
h 'j
c
/
m
aint-sane-execvp-notdir' into
m
ain
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Ham
a
n
o
Merge
b
ran
c
h 'jc/maint-c
o
n
fig-exit-sta
t
us' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
i
o
C
Hamano
Merge bra
n
c
h
'
mh
/
maint-config
-
doc-proxy-command' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
uni
o
C Hamano
Merge branch 'hv/submodule-path-unmat
c
h' into m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Merge branch 'm
z
/
empty-rebase-test
'
into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hama
n
o
Merge br
a
nch '
j
k
/
d
o
c
s
-docbook-mo
n
ospace-display'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Me
r
ge b
r
anch 'ab/diff-wr
i
te-incomplet
e
-
l
ine' in
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge br
a
nch
'
jc/m
a
int-t7
4
06
-
rev
-
par
s
e-ma
x
-count
-
huh
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hama
n
o
Me
r
ge branch 'rr/precompos
e
-u
t
f8-cl
e
anup
'
into maint
commit
|
commitdiff
|
tree
2012-09-11
Junio C H
a
m
a
no
Me
r
g
e
branc
h
'
j
c/capabilit
i
es' into maint
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Ham
a
no
Mer
g
e branch
'
jc/doc
-
git-updates' into main
t
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Hamano
M
erge
b
ranch
'
j
k
/c
h
eck-docs-up
d
a
t
e
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Hamano
Merge branch 'tr/void-diff-setup-done' i
n
to maint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
i
o
C Haman
o
Merge bran
c
h 't
r
/merge-recursive-flush' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Ha
m
ano
Merge
br
a
n
ch 'nd/index-errno' into main
t
-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Ha
m
ano
M
erge
b
ranch 'pg/maint
-
apply-r
e
move-
u
n
u
sed-variable
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
ni
o
C
H
a
m
ano
Merge
b
ranch 'jc/test-
p
rereq' i
n
to maint
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Hamano
blame $
p
ath: avoi
d
g
e
tting
fooled by case insensi
t
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
a
m
a
n
o
Start
preparing for
1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C Hamano
Merge
b
ran
c
h 'bc/pru
n
e-info' into maint
commit
|
commitdiff
|
tree
2012-09-10
Junio
C Hamano
Merge branch 'maint-1
.
7
.
11' into maint
commit
|
commitdiff
|
tree
2012-09-10
Junio C
Ha
m
ano
Almost 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C
Haman
o
Merge branch 'mg
/
r
ebase-i-onto-r
e
flog-
i
n-full
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Mer
g
e branch 'jc/maint-protec
t
-sh-from-if
s
' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
n
io C Hamano
Merge b
r
anch '
b
c
/recei
v
e-p
a
ck-stdout-pr
o
tecti
o
n
' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
Hamano
Merge
b
ranch 'jk/maint-null-in-trees'
i
nto
m
ai
n
t-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hama
n
o
Merge b
r
anc
h
'tr/ma
i
nt-s
e
n
d-email
-
20
4
7'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
ni
o
C Hama
n
o
M
erge br
a
nch 'mm/d
i
e-wi
t
h-das
h
dash-help'
i
nto main
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
M
e
rge
b
ranc
h
'js/gitweb-path
-
inf
o
-unquote' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
nio
C
Hamano
gitcli: contrast
w
ildcard gi
v
en to shell and to git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Hamano
git
c
l
i:
f
o
r
matting fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Juni
o
C Hamano
mailinfo: strip "RE: " pre
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
nio
C
Hamano
attr
:
"bin
a
ry" attribute should choose b
u
ilt-in "bi
n
ary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Junio C Ham
a
n
o
merge: teach -Xours/-Xtheirs to binary ll-merge
d
r
iver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next