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 Ha
m
ano
S
y
nc with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Git 1
.
7
.
1
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C H
a
man
o
Merge branch 'jk/push-delete-ref-
e
rr
o
r-mes
s
age'
into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Merge branch 'a
r
/clone-honor-umask-at-top' into maint
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hamano
M
e
rge
branc
h
'cw/amend-commit-without-message' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
ama
n
o
Merg
e
branc
h
'j
k
/maint-
c
ommit
-
amend-o
n
ly-no-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C
H
a
mano
M
e
rge
b
r
anc
h
'tg/mai
n
t-c
a
che-name-
c
ompar
e
' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Mer
g
e branch 't
r
/
maint-show-wal
k
' int
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C
Ha
m
ano
Merge br
a
n
c
h
'jc/refactor-diff-s
t
di
n
' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-07-22
J
un
i
o
C Hama
n
o
Merge
b
ran
c
h 'mz/empty-re
b
a
se-test' into
main
t
commit
|
commitdiff
|
tree
2012-07-22
J
uni
o
C Hamano
Merge branch 'js/fa
s
t-e
x
port-pat
h
s
-with-spaces' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
Merge branch 'cw/no-detaching-
a
n-unborn
'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
erge branc
h
'
v
r/
u
se-our-perl-in-tests' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge gi
t
:
/
/bogo
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge branch
'j
k
/
r
evisi
o
n-walk-stop-at-max-count'
commit
|
commitdiff
|
tree
2012-07-22
J
uni
o
C Haman
o
M
e
rge branch 'mm/config-xdg
'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C H
a
m
a
no
M
e
rge bra
n
ch 'as
/
t4012-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge branch 'pg/mai
n
t-1
.
7
.
9-am-where-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
M
er
g
e branch 'jl/ma
i
nt-1
.
7
.
10-recurs
e
-s
u
bmodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio
C Hamano
Mer
g
e
b
r
a
nch 'ms/daemon-doc-typo
'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge b
r
anch 'lk/more
-
h
elp
f
u
l
-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C Hamano
Mer
g
e br
a
nch 'j
c
/sha1-n
a
m
e
-
more'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C H
a
mano
Merge branc
h
'jc/maint
-
filter
-
branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
U
p
date draft release
notes for 7th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C
H
amano
Merge br
a
nch 'tg
/
m
aint-ca
c
he-name
-
co
m
pare'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Hamano
Merge branch
'jk
/
index-pack-st
r
eami
n
g-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge branch 'jk/maint-com
m
it-amend-o
n
ly-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'c
w
/a
m
end-commit-withou
t
-
message'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Haman
o
M
e
r
g
e branch 'jn/makefile-cleanup
'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Ham
a
n
o
Me
r
ge
b
r
a
nch 'ar/clon
e
-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge b
r
anch
'jc/ap
p
ly-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
H
amano
Merge
b
r
a
nch 'cw/re
b
ase-i-roo
t
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merg
e
br
a
nch 'pw
/
git-p4-
m
ove'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C
H
aman
o
Merg
e
bran
c
h 'pw/
g
it-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch
'
j
k/pu
s
h
-de
l
ete-ref-error-message
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Sixth batch fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Ha
m
ano
Merge branch 'jc/refactor-diff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Merge branch 'tg/ce-namele
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ha
m
ano
Merge branch 'tb
/
sanitize-d
e
comp
o
s
ed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hama
n
o
Merge branch 'mm
/
m
e
diawiki-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge branc
h
'j
n
/vcs-svn
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge branch '
m
m/m
e
diaw
i
ki-file-attachmen
t
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
m
a
no
M
erge branch
'tr/
m
aint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
anch 'mz
/
rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Haman
o
t1
5
12
:
m
a
tch the "ot
h
e
r
"
object names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Jun
i
o C Hama
n
o
t7
0
03: add te
s
t to filter a bran
c
h with
a
comm
i
t
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Juni
o
C
Hamano
date
.
c
:
Fix off
by
o
ne error in object-head
e
r
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
t1512:
ignore whitespa
c
es in
w
c -l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hama
n
o
Red
u
ce dr
a
ft rel
e
ase notes t
o
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Sy
n
c wit
h
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
am
a
no
G
i
t 1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
am
a
n
o
Merge branch 'jc/maint-bla
m
e-uniqu
e
-abbre
v
' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Me
r
ge branch 'rj/pl
a
tform
-
pr
e
ad-may-
b
e
-thread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Merge br
a
nch 'th/d
i
f
f
-no-index-f
i
xes' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
M
e
rge branch '
n
d/clone-si
n
gle-fi
x
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Merge branch 'jc/re
v
-list-si
m
plify-merges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o C H
a
ma
n
o
M
e
rge branch 'hv/submodu
l
e
-
update-nuke-submo
d
ules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jk/d
i
ff-no-index-
p
ager'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge branch 'mm/verify-
f
ilename-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge bra
n
c
h
'cn/cherry-pick-range-docs'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ham
a
no
Mer
g
e bra
n
ch 'jc/ustar-
c
hecksum-is-unsign
e
d' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Mer
g
e
branch 'jc/bund
l
e-complete-notice' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
a
mano
Me
r
g
e
bra
n
ch 'jc/ls
-
files-i-d
i
r
'
in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Me
r
ge branch 'jc/request-pull-match-tag
n
ame'
int
o
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
cache_name_compare(): do not truncate
wh
i
le co
m
paring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C
Hamano
a
p
ply:
test
s
for the --3way
o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Ju
n
io C Hamano
filt
e
r-branch:
d
o not forg
e
t th
e
'@' p
r
e
fix to fo
r
ce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
rev-parse --disambig
u
a
te=<
p
refix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
rev-pars
e
: A and B
i
n "rev-parse A
.
.
B" refer
t
o c
o
mm
i
ttish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
r
e
set:
the
command takes
committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commit-tre
e
: the co
m
ma
n
d wants
a
tree
and
co
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y: --build-fake-ances
t
or expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
sha1_
n
a
me
.
c: add
s
up
p
ort for disambiguating other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
revision
.
c
:
t
he "l
o
g" f
a
m
ily, excep
t
for "show", tak
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revis
i
on
.
c: allow handle_re
v
ision_arg() to
t
ak
e
o
ther
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_name
.
c: introduce
g
et_
s
ha1_commi
t
tish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
sha1_nam
e
.
c: teach lo
o
k
u
p co
n
text to get_sha1_with_context()
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 names
c
a
n 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
sha
1
_name
.
c:
g
e
t_sha
1
_1() takes look
u
p flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
sha1_name
.
c
:
g
e
t
_descri
b
e
_name() by defini
t
ion
grok
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
rere
r
e: make rr-cache fano
u
t direc
t
ory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: documen
t
--3wa
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
ply: allow rer
e
re() to work o
n
--3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: regist
e
r
conflicted stages t
o
the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
ly: --3wa
y
wi
t
h add/add co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply:
m
ov
e
verify_ind
e
x_matc
h
(
)
h
i
gher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
pl
y
: plug the three-way
m
erge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
apply:
f
a
ll
b
ack on th
r
ee-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
apply: acce
p
t -3/--
3
way
c
o
mmand line opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
a
p
ply:
m
ove "already
e
xists" l
o
g
i
c
t
o che
c
k_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
apply:
m
o
ve
check_to_create
_
blob(
)
closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
f
urther spli
t
l
o
ad_preimag
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refa
c
tor "pre
v
ious pat
c
h" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
app
l
y
:
split load_preimage
(
)
help
e
r f
u
ncti
o
n out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: fact
o
r out checkout_target() helper
f
uncti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
r
e
factor rea
d
_
f
i
l
e_o
r
_g
i
tlink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: clear_i
m
a
ge(
)
clear
s
things a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
ama
n
o
ap
p
ly: a bi
t
more
comments o
n
P
A
TH_TO_B
E
_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
p
ply
:
f
ix an incomplete comment in
check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
r
ge git://g
i
thu
b
.
c
om/g
i
t-l10n/
g
it-po
commit
|
commitdiff
|
tree
next