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
Sync with 1.7.11.3
2012-07-22
Junio C Hama
n
o
Sync wit
h
1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C H
a
mano
Git 1
.
7
.
11
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge
bra
n
ch 'jk/push-dele
t
e-ref-error-me
s
sa
g
e' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge b
r
anch
'
ar/clone-hono
r
-
u
m
ask-at-top' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge
bran
c
h 'cw/amend-commit-wi
t
hou
t
-
m
essage
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Mer
g
e branch 'jk/maint-commit-amend-only-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hamano
Merge bra
n
ch 'tg/maint-cache-name-com
p
are' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Haman
o
Merge branch 'tr/mai
n
t
-show-walk' into main
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'j
c
/refactor-diff-s
t
di
n
' into maint
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
M
e
rg
e
branch 'm
z
/empty-rebase-test' in
t
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
branc
h
'js/fast-
e
xpor
t
-paths-wi
t
h
-spaces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
M
e
rge bran
c
h 'cw/no-
d
etac
h
ing-an
-
u
nborn' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'vr/use-our-pe
r
l-in-t
e
sts'
into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Ham
a
no
Mer
g
e git://bogomips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'jk/revisio
n
-walk-stop
-
at-max-count'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'mm/con
f
ig-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
i
o C Hamano
Me
r
ge bran
c
h 'as/t4012-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
J
u
n
io C Ham
a
no
Merge b
r
a
n
ch
'pg/maint-1
.
7
.
9-am
-
wh
e
re-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
branch
'
jl
/
mai
n
t
-
1
.
7
.
10-recurse
-
submodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge bra
n
ch
'
m
s/daemon-doc-ty
p
o'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
M
erge branc
h
'
l
k/more-
h
e
lp
f
ul-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Merge bra
n
ch '
j
c
/
s
ha1-name-more
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge branch 'jc/ma
i
nt-filter-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Update
dr
a
f
t
re
l
eas
e
no
t
e
s
for
7th batc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
an
o
Mer
g
e branch 'tg/maint-
c
ache-n
a
me
-
compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rge bran
c
h 'jk
/
i
n
dex-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Merge branch 'jk/maint-commit
-
amend
-
only
-
no-
p
ath
s
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
ni
o
C
Hamano
Merge br
a
nch 'cw
/
ame
n
d-com
m
it-without-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Merge branch '
j
n/make
f
ile-cl
e
a
n
up'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge
branch
'ar/clon
e
-hono
r
-umask
-
a
t
-to
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
a
man
o
M
e
r
ge branch 'jc/ap
p
ly-3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Ha
m
ano
Merge
b
r
a
nch 'cw/rebase
-
i-
r
o
o
t'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge branch 'pw
/
git-
p
4-mov
e
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hamano
M
e
rge branch 'pw/
g
it-p4-jobs
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge bra
n
ch
'
jk/push-delete-ref-e
r
ror-message'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Me
r
ge branc
h
'jc
/
re
f
ac
t
or-dif
f
-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ham
a
n
o
M
e
rge br
a
n
c
h 'tg/ce-namele
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Ham
a
n
o
M
erge bran
c
h 'tb/
s
a
niti
z
e-decompos
e
d-utf-8-p
a
thname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
br
a
nch '
m
m/med
i
aw
i
ki
-
tests'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ha
m
ano
Merge branch 'jn/
v
cs-svn
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Ham
a
no
Merge
bran
c
h
'
m
m/mediawiki-file-attachme
n
ts'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C H
a
man
o
Merge branch
'
tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Mer
g
e
br
a
nch 'mz/re
b
ase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
mano
t151
2
: mat
c
h the "other" obje
c
t names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
J
un
i
o C Hamano
t7003: add test to filter
a branch
w
ith a com
m
i
t
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Haman
o
date
.
c: F
i
x off by
o
ne error
i
n object-header date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
t15
1
2: i
g
no
r
e wh
i
tespaces in wc -l
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Reduc
e
draft releas
e
notes t
o
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
S
y
nc with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Hamano
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'j
c
/
maint-
b
lame-uniqu
e
-abbrev' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'rj/pl
a
t
f
orm-pread-may-be-
t
hread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'th/diff-
n
o-index-f
i
x
e
s' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge
b
ranch 'nd
/
cl
o
ne-single-
f
ix' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
Merge
b
ranch 'jc/re
v
-
list-simplify-m
e
rges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge br
a
nch 'h
v
/submodule-upda
t
e-nuke-s
u
bmodules
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'jk/dif
f
-n
o
-
index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm/verify-filename-f
i
x' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge
b
ranch 'c
n
/
c
herry-pick-rang
e
-do
c
s' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch
'
jc/ust
a
r-checksum-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ha
m
ano
Merge branc
h
'
j
c/bun
d
le-complete-no
t
ic
e
'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
r
ge b
r
a
n
ch '
j
c/ls-files-i-dir' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge
branch 'jc/request-pull-match-tagnam
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
ca
c
he_na
m
e_compare(): do
n
o
t truncate whi
l
e comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
a
mano
apply: tests fo
r
the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C Hamano
filt
e
r-branc
h
: do n
o
t forget the '@' pre
f
i
x
to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
rev-parse
--disa
m
bigua
t
e=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
ev-pa
r
se
:
A and B in "rev-parse
A
.
.
B" r
e
fer to committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
r
eset: th
e
command ta
k
es co
m
mi
t
t
ish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
co
m
mit-tr
e
e
:
t
h
e command
wan
t
s
a tr
e
e
and c
o
mmits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: --build
-
fake-ances
t
o
r expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: ad
d
sup
p
ort for di
s
ambiguating o
t
her types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c: the "log" fa
m
il
y
,
exc
e
p
t
for "
s
how",
t
ake
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c: allow handle_r
e
vision_
a
rg()
t
o take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha1_name
.
c: int
r
o
d
u
ce get_sha1_
c
ommittish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sh
a
1_name
.
c:
t
e
a
ch lookup context to get_sha1_with_contex
t
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
sha1_
n
a
m
e
.
c: many short nam
e
s can only be com
m
i
t
tish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
sha1
_
nam
e
.
c: get_sha1_1() takes l
o
okup f
l
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
sha1_name
.
c: get_describe_name
(
) by defini
t
ion groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
rerere
:
make rr-cache fanout directory h
o
nor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
a
p
p
l
y: doc
u
me
n
t --3
w
ay opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: allow
rerere() to work on --3w
a
y results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply
:
register conflicted stag
e
s
t
o the ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
appl
y
:
--3w
a
y with add/add confl
i
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply
:
mo
v
e
verify_
i
ndex_matc
h
() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug t
h
e three
-
way me
r
g
e
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fall back on t
h
ree-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
app
l
y: acce
p
t -3/--3way comma
n
d line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply
:
move "alre
a
d
y
e
x
i
sts" lo
g
ic
to
check_t
o
_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
ap
p
ly
:
move chec
k
_
t
o_cre
a
te_blob() cl
o
ser to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
ap
p
ly: furthe
r
split load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
apply: refactor "prev
i
ous pa
t
ch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
split l
o
ad_preimage() helper funct
i
on out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
a
p
ply: factor out
checkout_tar
g
et() helper
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
refact
o
r read
_
file_or
_
g
i
t
l
ink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
a
pply: c
l
ear_image() cle
a
rs th
i
ngs
a bit
m
or
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ham
a
no
ap
p
ly: a bit more comm
e
nts o
n
PATH_TO_BE_D
E
LETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
a
pply: f
i
x an incomplete comment in check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://githu
b
.
com/gi
t
-l10
n
/gi
t
-po
commit
|
commitdiff
|
tree
next