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 'mm/mediawiki-usability'
2012-07-24
Junio C Haman
o
Mer
g
e branch
'mm/mediawiki-usabili
t
y'
commit
|
commitdiff
|
tree
2012-07-24
Junio C
H
amano
Merge branch '
s
n/doc-typofix'
commit
|
commitdiff
|
tree
2012-07-24
Junio C H
a
mano
Merge br
a
nch 't
g
/ce-namelen
-
field'
commit
|
commitdiff
|
tree
2012-07-24
Junio C Hamano
Merge branch 'n
k
/maint-gi
t
we
b
-l
o
g-by-lin
e
s'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Updat
e
draft release note
s
to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Syn
c
with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Gi
t
1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
i
o
C Ham
a
no
M
e
r
ge bran
c
h 'jk/push-delete
-
ref-error-me
s
s
a
ge' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
e
rge
b
r
a
n
ch 'ar/clone-h
o
nor-
u
mask
-
at-to
p
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
J
uni
o
C Hamano
Mer
g
e b
r
anch
'cw/amen
d
-commit-without-me
s
sage' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
ge br
a
nch 'jk
/
maint-commit-
a
m
e
nd-only-n
o
-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merg
e
br
a
nch 'tg/maint-cac
h
e-name-comp
a
re' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge bra
n
ch '
t
r/maint-
s
how-w
a
lk' into maint
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Haman
o
Merge branch 'jc/ref
a
ctor-diff-stdi
n
' i
n
t
o m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C
Hamano
Mer
g
e
br
a
nch 'mz/empty-re
b
ase-test' into m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'js/fast-e
x
p
o
rt-paths-with-spaces' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'cw/no-detach
i
ng-a
n
-unbo
r
n
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
H
a
mano
Merge branc
h
'vr/u
s
e
-
our-perl
-
i
n
-te
s
ts' int
o
main
t
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C
Hamano
Merge git://bogo
m
ips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
m
a
n
o
Merg
e
b
ranch
'
jk/r
e
v
i
sion-walk-stop-at-max-count'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
M
erge bra
n
ch 'mm/config
-
xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
b
ranch 'a
s
/t
4
01
2
-s
t
y
le-
u
pdates'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge bran
c
h 'pg/maint-
1
.
7
.
9-
a
m-w
h
ere-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merge branch
'
jl/
m
a
int
-
1
.
7
.
10-recurse
-
s
ubmodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e bra
n
c
h
'ms
/
daemon-
d
oc-t
y
po
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge b
r
a
n
ch
'
l
k/more-helpf
u
l-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
mano
Merge branch 'jc/sha1
-
name-more
'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hama
n
o
Merge bran
c
h
'jc/maint-f
i
lter-
b
ranch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io
C Ham
a
no
Update draft relea
s
e notes
f
o
r
7t
h
batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hama
n
o
M
e
rge branch 'tg/main
t
-cache-n
a
me-compar
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'j
k
/
index-p
a
ck-s
t
rea
m
i
ng-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
M
e
rge br
a
n
c
h 'jk/maint
-
com
m
it-amend
-
only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Mer
g
e branch 'c
w
/am
e
nd-commit-without-m
e
s
s
age'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge bra
n
ch 'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
M
e
rge branch
'
a
r/clone-ho
n
o
r
-umask-at-
t
op'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
br
a
n
c
h
'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge b
r
anch 'cw/rebase-i
-
r
o
ot'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ha
m
ano
Merg
e
branch 'pw/git-
p
4-mov
e
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
H
amano
Merge b
r
a
n
ch 'pw/git-
p
4-j
o
bs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
e
rge bra
n
ch 'jk/pu
s
h-delete
-
ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
S
i
xth b
a
tch f
o
r 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
branch 'jc/
r
efactor-diff-stdin
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C
H
am
a
no
Merge branch 't
g
/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hama
n
o
Mer
g
e br
a
n
ch 'tb/sanitize-decomposed-utf-8
-
p
a
thn
a
me'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bra
n
ch 'mm/mediawiki-tests
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
a
nch 'jn
/
vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch
'mm/mediawiki-file-att
a
chments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge branch
'tr/ma
i
nt-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Ha
m
a
n
o
M
e
rg
e
b
r
anch 'mz/rebase-no-mbox
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
t1512: match t
h
e "ot
h
er
"
object names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t
7
003:
a
dd
t
est to filter
a bra
n
c
h
with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Ham
a
no
date
.
c: F
i
x off
by one error
i
n
o
b
ject-header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
t1512
:
ignore wh
i
tes
p
aces
i
n
wc
-
l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
Reduce draft
rel
e
ase no
t
es to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C Hamano
Sync with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
G
i
t
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e branch 'j
c
/
m
a
i
nt-blame-uni
q
ue-a
b
brev'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C H
a
mano
Merge
branc
h
'rj/pla
t
form-pread-ma
y
-be
-
t
h
r
ead-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C
Hamano
Merge br
a
nch 't
h
/diff-
n
o-inde
x
-fixes' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Haman
o
Merge
bran
c
h 'n
d
/c
l
one-s
i
ng
l
e-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
amano
Merge branc
h
'jc/re
v
-list-simplify-mer
g
es-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch 'h
v
/s
u
b
mod
u
le-update-
n
uke-
s
ubmo
d
ules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch '
j
k/d
i
ff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
M
e
rge branch 'm
m
/
ver
i
fy-
f
ilena
m
e-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
Mer
g
e branch 'cn/cherry
-
pick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge b
r
anc
h
'
j
c
/
u
star-checksum-is-
u
nsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
H
a
ma
n
o
M
e
rge
bra
n
ch 'jc/
b
undle-co
m
plete-notice' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
branch 'jc/ls-f
i
l
e
s-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
m
ano
Me
r
ge bra
n
ch 'jc
/
request-
p
ul
l
-match-tagna
m
e
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge
b
ra
n
c
h
'tg/maint-cache-nam
e
-com
p
are' in
t
o tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
cache_name_c
o
mp
a
re()
:
d
o
no
t
tr
u
ncat
e
w
h
ile com
p
aring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests for t
h
e --3way
opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
aman
o
filter-branc
h
: do not forget the '@' pr
e
fix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-
p
arse --di
s
ambiguate=<p
r
efix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
rev-parse: A a
n
d B in "rev-par
s
e A
.
.
B" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
re
s
et: t
h
e com
m
and take
s
committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commit-tree: the comman
d
want
s
a tree
a
nd commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: --build-fake-ancestor expects
b
lob
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
sha1_name
.
c: add
suppo
r
t for d
i
sambi
g
uating other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
r
evision
.
c: the "log" family
,
except for "
s
h
ow", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
rev
i
sion
.
c: a
l
low handle_revision_arg() to take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
sha1_
n
ame
.
c:
i
ntroduce
get_sha1_committish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
sha1_name
.
c
:
teach look
u
p context
t
o get_sh
a
1_with_context(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
sha1_name
.
c: many s
h
ort na
m
es can only be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
s
ha1_n
a
me
.
c
:
ge
t
_
sha1_1()
ta
k
es lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
s
ha
1
_name
.
c:
g
et_
d
escribe_name()
b
y
definition
g
roks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
re
r
ere: make rr-cache fanou
t
dir
e
c
tor
y
ho
n
or
u
mas
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly: document
--3wa
y
o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: a
l
low
re
r
ere() to w
o
rk
on --3
w
ay results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hama
n
o
apply: regi
s
te
r
conflicted
stages t
o
th
e
i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
ap
p
ly: --3wa
y
w
i
th
add/
a
dd conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
apply: move ve
r
ify_index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply:
plug the t
h
ree-w
a
y m
e
rge log
i
c i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
ap
p
ly: fall bac
k
on
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
a
pply: accept
-
3/
-
-3way command l
i
ne option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
a
p
ply: move "alread
y
exists" logic to check
_
to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply
:
m
o
v
e check_
t
o_create_
b
lob() closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: fur
t
h
e
r split load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Ha
m
ano
apply: ref
a
cto
r
"previous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
apply
:
sp
l
it load_pr
e
i
m
age() help
e
r
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next