repo.or.cz
/
git
/
dscho.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 Hamano
Sync with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Ham
a
no
G
i
t
1
.
7
.
11
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-22
J
un
i
o C
H
a
m
ano
Merge
branch 'jk/push-del
e
te-
r
ef
-
err
o
r-messag
e
' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge branch 'ar/
c
l
o
n
e
-
honor-
u
mas
k
-at-t
o
p' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge branch 'cw/a
m
e
n
d-commi
t
-witho
u
t-messa
g
e
' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'jk/maint-commit-a
m
end-
o
nly-
n
o-
p
aths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Haman
o
Merge bran
c
h 'tg/main
t
-cach
e
-name-compare'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Merge branch 'tr/
m
aint-show
-
wal
k
' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
a
n
o
Me
r
ge branch
'jc/refactor
-
dif
f
-s
t
din' into maint
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C Hamano
M
erge branch 'mz/
e
mpt
y
-
r
e
b
ase-test' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
H
amano
M
erge branch 'js/
f
ast
-
expor
t
-paths
-
with
-
sp
a
ces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Me
r
ge br
a
nch 'cw/no
-
detachin
g
-
a
n-unborn'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge b
r
a
n
ch
'
vr/use-
o
ur-perl-in-
t
e
s
ts' i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge git://bogomips
.
org/git
-
sv
n
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merg
e
branch 'jk/revision-walk-stop
-
at-max-coun
t
'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C
Hamano
Merge bra
n
ch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
M
e
rge branch '
a
s/t4
0
12-style-up
d
ates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge bran
c
h 'pg
/
maint-1
.
7
.
9-am-w
h
ere-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge branch 'jl/maint-
1
.
7
.
10-recur
s
e-submod
u
les-wi
t
h
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C
Hamano
Merge branch 'm
s
/daemon-doc-t
y
p
o'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
erge br
a
nch 'lk/m
o
re-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
H
ama
n
o
Merg
e
branch 'jc/sha1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
M
e
rge branch
'jc/maint-f
i
lter-branc
h
-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Ha
m
a
n
o
Update draft
release
n
otes f
o
r 7th b
a
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge br
a
nch
'tg/maint-cache-na
m
e
-com
p
are'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e br
a
nch 'jk/index-pack-streaming-fix
'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C Hamano
M
erg
e
branch '
j
k
/maint-commit-amend-only
-
no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge branc
h
'cw/amend-c
o
mm
i
t
-wi
t
hout-message'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C H
a
mano
Merge b
r
anch 'jn
/
makefile-cl
e
anup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merge
b
ranch 'a
r
/clone-honor-u
m
a
sk-
a
t-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C
H
a
m
a
no
Merge branch 'jc/a
p
ply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merg
e
branch 'cw/rebase-
i
-root'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io
C
Ha
m
ano
Merge bra
n
ch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hamano
Merge branch
'
pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Juni
o
C
H
a
ma
n
o
Merge
b
ranc
h
'jk/push-delete-re
f
-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
n
o
Sixth ba
t
ch for
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'j
c
/refactor-di
f
f-st
d
in'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Ha
m
a
n
o
Merge branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o C Hamano
Merg
e
b
r
anch 'tb/sanitize-deco
m
pos
e
d-utf-8-pat
h
name'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge branch 'mm/mediawiki-
t
e
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge branch
'
j
n
/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Mer
g
e b
r
a
nch
'
mm/
m
ediaw
i
ki-file-atta
c
hments'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hama
n
o
Merge bran
c
h
'
tr/maint
-
show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Mer
g
e branch
'mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
t1512: match the "othe
r
" o
b
je
c
t names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Hamano
t
7003:
add test to f
i
lt
e
r
a b
r
a
nch with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C
Hama
n
o
date
.
c: Fi
x
off
b
y
o
ne
er
r
or in
o
bject-header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C
H
a
m
a
n
o
t1512
:
i
g
nor
e
wh
i
tespaces
i
n wc -l outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C
Hamano
R
educe
d
raft release no
t
es to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Ha
m
ano
S
ync with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branch 'j
c
/m
a
int-b
l
ame-u
n
ique-abbr
e
v' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge bran
c
h
'
rj/
p
latform-pread-may-
b
e-thre
a
d-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
e
r
ge branc
h
'
t
h/dif
f
-no-i
n
dex-fixe
s
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Hamano
Merg
e
branch '
n
d/cl
o
ne-s
i
ngle-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hamano
Merge bran
c
h '
j
c/rev-list-simplif
y
-merges-fir
s
t-p
a
rent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Me
r
g
e
branc
h
'hv/
s
u
bmodule-
u
pda
t
e-
n
uke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
M
er
g
e branch 'jk/diff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Mer
g
e branch 'mm/verify-filename-fix'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ha
m
ano
Merge branch 'cn/cherry
-
pick-ran
g
e-docs' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/ustar-checksum-is-
u
n
signed
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bra
n
ch
'jc/
b
undle-complete-notice
'
into
main
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Hama
n
o
Merg
e
bran
c
h
'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
Merge branch 'jc/reques
t
-
pull
-
match-tagname' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cach
e
_name_compare(): do
n
ot truncate whil
e
co
m
pari
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
a
p
p
ly:
t
ests for the
--3
w
a
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C
H
amano
filter-
b
ra
n
ch: do not forget the '@' prefix to for
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
rev-par
s
e --disambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rev-parse: A and B in "rev-parse A
.
.
B" re
f
er to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
res
e
t:
th
e
c
o
mma
n
d takes c
o
mmittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
comm
i
t-tr
e
e: the command wants a tree and
c
o
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
--build
-
fake-ancestor expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
n
o
s
ha1_name
.
c:
a
dd sup
p
ort for di
s
ambig
u
ating other
t
ypes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revisio
n
.
c:
t
he "log" family, except f
o
r "s
h
ow", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
revis
i
on
.
c: all
o
w handle_r
e
vision_arg
(
) t
o
take o
t
her
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
sha1_name
.
c
: intr
o
duce get_sha
1
_committish
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha1
_
n
a
me
.
c: teac
h
lookup conte
x
t to get_sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1
_
name
.
c:
m
any
s
hort names can only b
e
committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
sha1_name
.
c: get_sha1_1() takes lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
H
amano
sha1_na
m
e
.
c:
g
et_
d
esc
r
ibe_name()
by definition g
r
oks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
rerer
e
: ma
k
e rr-cach
e
f
an
o
ut
d
i
rectory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: document --3way o
p
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
appl
y
: a
l
low rerer
e
(
)
to work on
--
3
way re
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
app
l
y: register conflicted stage
s
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
pply: --3
w
ay with add
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
apply: move verify_index_
m
atc
h
() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply: plug t
h
e
three-way merge
logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
apply: fall
b
ack on thre
e
-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: ac
c
ept -3/--3way
c
omm
a
nd line opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
apply: mov
e
"
a
lready exists" logic t
o
ch
e
ck_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
a
p
ply: move check_to_create_blob() closer t
o
its s
o
le
.
.
.
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
u
r
th
e
r s
p
lit load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: refactor
"p
r
evio
u
s patch"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: s
p
li
t
lo
a
d_
p
reimage
(
) helper func
t
ion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fa
c
tor ou
t
c
heckout_target() helper
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: refac
t
o
r
r
e
ad_f
i
le_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
p
ply: cl
e
ar_image() clears thin
g
s a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
apply
:
a bit
more comments
on PATH_TO_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
pply
:
fi
x
an
i
ncomplet
e
c
omment in check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge git://g
i
t
h
ub
.
co
m
/
g
it-l1
0
n
/
git-po
commit
|
commitdiff
|
tree
next