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 Hama
n
o
Merge branch 'j
c
/ll-m
e
rg
e
-bi
n
a
ry-ours' into maint
commit
|
commitdiff
|
tree
2012-10-17
Junio C
H
a
mano
Merge branc
h
'db/doc-cu
s
tom-xml
t
o' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-10-09
Junio C
H
amano
Me
r
g
e
branch 'm
a
in
t
' of git://git
h
u
b
.
co
m
/git-l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Junio C
H
amano
Git 1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-08
Ju
n
i
o
C Hamano
M
e
r
g
e
b
ranch
'
os/
c
om
m
it-su
b
m
odu
l
e-ignor
e
' into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
M
erge bran
c
h 'jk/receive-pack
-
unp
a
c
k-error-to-
p
us
h
er
.
.
.
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Mer
g
e
branch 'rt/maint-clone-single
'
into maint
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
M
erge branch 'jc/blame-follows-ren
a
m
e
s'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-10-08
Junio C Hamano
Merge
branch 'lt/m
a
ilinfo-handl
e
-a
t
t
a
c
hment-mo
r
e-
s
anely
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Junio
C
Hama
n
o
S
tart preparing
for 1
.
7
.
12
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-10-02
Juni
o
C Ha
m
ano
M
erge br
a
nch
'rr/maint-submodu
l
e-unkn
o
wn-cmd
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
Junio
C Ha
m
ano
Merge branc
h
'sp/maint
-
http-
e
nable-gzip' into maint
commit
|
commitdiff
|
tree
2012-10-02
J
unio C Hamano
Merge
b
ranc
h
'
s
p/maint-http-info-refs
-
no-retry' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C
H
a
mano
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 branch
'
maint
'
of git://g
i
thub
.
com/git-l1
0
n/git
.
.
.
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merg
e
branch 'jc
/
maint-log-gre
p
-all-match-1' into main
t
commit
|
commitdiff
|
tree
2012-09-30
Junio C Hamano
Merge branch
'jc/maint-
m
ailinfo-mime-attr'
into maint
commit
|
commitdiff
|
tree
2012-09-24
Junio C Ham
a
no
St
a
rt prepa
r
ation
for 1
.
7
.
12
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-24
Junio C Hamano
Mer
g
e
branch
'jc/
m
ai
n
t-blame-no-
s
uch-path' into mai
n
t
commit
|
commitdiff
|
tree
2012-09-24
Ju
n
io C Hamano
Merge branch 'd
j
/fetc
h
-all-t
a
gs' into maint
commit
|
commitdiff
|
tree
2012-09-21
Juni
o
C Hamano
git blame:
doc
u
m
e
nt that it always
f
o
l
l
ows origin acro
s
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-20
Jun
i
o
C Hamano
Merge branch 'nd/maint-diff
s
t
at-summary' into main
t
commit
|
commitdiff
|
tree
2012-09-20
Ju
n
i
o C Hamano
Merge
b
ranch 'jw
/
do
c
-c
o
mmit-tit
l
e' into maint
commit
|
commitdiff
|
tree
2012-09-20
Jun
i
o C Hamano
Merge branc
h
'
dg/run-
c
o
m
mand-child
-
cleanup' int
o
maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merge branch 'jc/mailinfo-RE' into mai
n
t
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
M
erge branch 'sn/l
s
-remot
e
-get-url-doc' into
maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C
Hamano
Me
r
ge branch 'nd/log-n-doc' into m
a
int
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hamano
Merge branch 'nd
/
maint-remot
e
-
re
m
ove' int
o
maint
commit
|
commitdiff
|
tree
2012-09-20
Junio C Hama
n
o
grep
.
c: make two symbols really file
-
scope
static t
h
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-18
Junio C Haman
o
Git 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-18
Junio C H
a
mano
Merge branch 'er/do
c
-
f
ast-import-done
'
into maint
commit
|
commitdiff
|
tree
2012-09-18
Juni
o
C Haman
o
M
erge branch 'j
k
/config-warn-on-inac
c
e
s
sible
-
paths
.
.
.
commit
|
commitdiff
|
tree
2012-09-17
Ju
n
io C Ham
a
no
mailin
f
o: do not concatenate
c
harset= att
r
ibute values
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-16
Junio C Ham
a
n
o
grep
.
c: mark privat
e
file-scope
sy
m
b
ols
a
s
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hama
n
o
Dra
f
t
relea
s
e
notes to 1
.
7
.
1
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Juni
o
C Hamano
M
e
rge branch '
s
b/send
-
ema
i
l
-reconfirm-fix' into
m
a
int
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Mer
g
e branch
'
jc/send-emai
l
-reconfi
r
m' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-09-15
Junio
C Haman
o
Mer
g
e
branch 'm
z
/cherry
-
pi
c
k-cmdline-order
'
i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2012-09-15
Junio C
H
am
a
no
Sync with
1
.
7
.
11
.
7
commit
|
commitdiff
|
tree
2012-09-15
J
u
n
io C H
a
mano
Git 1
.
7
.
11
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Ju
n
i
o
C
Hamano
Merge branch 'jk
/
maint-quiet-is-synonym-to-s-in-log
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C
Haman
o
M
e
rge
branch '
j
c/
m
aint-
i
de
n
t-missing-
h
uman-name' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
M
erge branch 'rj/t
e
s
t
-regex' into
m
aint
-
1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Me
r
ge branch 'da/gitk-
r
e
load-t
a
g-contents' in
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C
Hamano
M
e
rge br
a
nch 'jc/ma
i
n
t
-
che
c
kout-fileglob-
d
o
c' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
l
og: document
u
s
e of mul
t
iple
commit lim
i
t
i
ng op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Junio
C
Hamano
log -
-
grep/--author: hon
o
r --all-
m
atch ho
n
ored
f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Junio C Ha
m
ano
grep: tea
c
h --debug option to dump 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
.
gitattributes file is O
K
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
J
uni
o
C
H
amano
Further merg
i
ng in pr
e
paration
fo
r
1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o C
Hamano
M
e
r
ge branch 'maint-1
.
7
.
11' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
M
erge bra
n
ch '
j
c/apply-
b
in
a
r
y-p0' into m
a
in
t
-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-12
Junio
C
Ham
a
no
Merge branch
'
jc/dotdot-
i
s-parent-
d
irect
o
r
y' into
main
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merg
e
bran
c
h
'jc/maint-d
o
c-checkout-b-always-
t
a
kes
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C Hamano
Merge branch
'jk/maint-h
t
tp-
h
alf-auth-push' i
n
to ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio
C
Hamano
Merge
branch 'kk/maint-for-each-ref-
m
ulti-sort' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
ll
-
merge: war
n
about
i
n
ability t
o
me
r
ge binary files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio C H
a
ma
n
o
blame: allo
w
"bla
m
e
file
"
in the middle of
a
conflicted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ha
m
ano
Further mergin
g
do
w
n for 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
S
ync with 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Hamano
Merge branc
h
'
j
s
/
use
-
s
c-open-m
a
x'
into m
a
int
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C
Hama
n
o
Merge
branch 'js/
n
o-cu
r
l-e
a
sy-
s
tre
r
ror-on-old
-
c
url
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
Git 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Merge branch 'jc
/
maint-mergetool-
s
tyle-
f
ix' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Haman
o
Mer
g
e bra
n
ch
'sz/
s
ubmodule-force-upda
t
e' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merg
e
branch 'ph/stash-re
r
ere' into
m
a
int-1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge
b
ranch 'jc/maint-san
e
-exec
v
p-notdir' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ham
a
no
M
e
rge branch
'
jc/maint-config-exit-status' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio C Hamano
Merge
b
ra
n
ch
'
m
h
/
mai
n
t
-config-doc
-
proxy-command' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C H
a
mano
M
erge bran
c
h
'hv/su
b
modul
e
-path-unmatc
h
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
un
i
o
C Hama
n
o
Mer
g
e
bra
n
ch 'mz/empty-
r
ebase-test' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hama
n
o
Merge branch 'j
k
/docs-docbook
-
mo
n
ospace-display'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C
Hamano
Merge
branch
'ab/diff-write-i
n
c
o
mplete
-
line' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
M
e
rge branch 'jc/maint-t7406-rev-p
a
rse-max-count-
h
uh
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Hamano
Mer
g
e branch
'
rr
/
precompose-utf8-cl
e
anup'
i
n
to main
t
commit
|
commitdiff
|
tree
2012-09-11
J
u
n
i
o
C Hamano
Merge br
a
n
c
h 'jc/capabi
l
ities' into
m
aint
commit
|
commitdiff
|
tree
2012-09-11
Junio C H
a
mano
Merge branch
'jc/doc-git-updates'
i
nto maint
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge branch
'
j
k
/
check-docs-update' into main
t
commit
|
commitdiff
|
tree
2012-09-11
J
u
ni
o
C Ha
m
an
o
Me
r
ge
b
ranch 'tr/voi
d
-diff-setup-done' into m
a
int-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o
C
Hamano
Merge branch 't
r
/
m
erge-re
c
ursive-flush'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ha
m
ano
Merge branch '
n
d/index-errno' into maint
-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
J
u
n
i
o
C Hamano
M
erge b
r
anch
'
pg/maint-apply
-
remo
v
e-unused-varia
b
l
e
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Merge branch
'
jc/test-prer
e
q' into maint
commit
|
commitdiff
|
tree
2012-09-11
Junio C H
a
mano
blame $path: avoi
d
getting fooled
by case insensitive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
J
un
i
o
C
Hamano
Sta
r
t preparing
f
o
r 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Haman
o
Merge branch '
b
c
/prune
-
info' into maint
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
Haman
o
M
erge br
a
nch
'main
t
-1
.
7
.
11' int
o
maint
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Almost 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
Merge branch 'mg/reb
a
s
e
-i
-
ont
o
-reflog-in-full
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
Ha
m
ano
Merge branc
h
'jc/maint-prote
c
t-sh-from-ifs' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
nio
C
Hamano
Merge branch 'bc/rece
i
ve-pac
k
-st
d
out-
p
rotect
i
on' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hama
n
o
Merge bra
n
ch 'jk/main
t
-null-in-
t
rees' into m
a
int-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
n
i
o C H
a
mano
Merge
branc
h
't
r
/maint-send-email-
2
047
'
into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merge branch 'mm/die-
w
ith-da
s
hdash-he
l
p' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C Ha
m
ano
Merge br
a
nch
'
js/gitweb-
p
ath-in
f
o-unquote' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
H
am
a
no
gitcli:
c
on
t
r
ast
wildcard given to shell and to git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
Junio C
Ha
m
ano
gitcli: for
m
atti
n
g
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Junio C
Hamano
m
ailinfo: strip
"RE:
"
pr
e
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-09
Junio C Ham
a
no
attr: "b
i
n
ary" attribute
s
h
o
uld
c
hoose built-in "b
i
nary
.
.
.
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-m
e
rge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next