repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with maint
2012-07-14
Junio C H
a
mano
Merge branc
h
'jk/push-de
l
e
t
e-ref
-
e
r
ror-message'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
S
i
x
t
h ba
t
ch f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Ha
m
a
n
o
Mer
g
e b
r
a
nch 'jc/ref
a
ctor-d
i
ff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch
'
tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C
Hamano
Merge b
r
anch 'tb/san
i
tize-dec
o
m
posed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'mm/mediawiki-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge b
r
anch 'jn/
v
cs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
M
erg
e
branch 'mm/mediawik
i
-
f
i
l
e-
a
ttachments
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge br
a
nch 'tr/ma
i
nt-show-
w
alk'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Hamano
Merge branch '
m
z/r
e
base-no-mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
t1
5
12: ma
t
ch
t
h
e "other" ob
j
ect names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
nio C Ham
a
n
o
t70
0
3: add
t
e
st t
o
filt
e
r
a branch wi
t
h a commi
t
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Hamano
da
t
e
.
c: Fix off
b
y
one error in object-header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
t1512
:
ignore
w
h
itespaces in wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Re
d
uce draft
r
elease n
o
t
e
s to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C
H
ama
n
o
Sync
w
ith 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Ha
m
ano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
Hamano
Merge branch 'jc/maint-blame
-
u
n
iq
u
e
-
abbrev
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch
'
rj/platform-pread-may-be-thread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C
Hamano
Merge bra
n
ch
't
h
/d
i
ff-no-
i
nd
e
x-fixes'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Ha
m
ano
M
e
r
g
e branch
'
nd
/
cl
o
n
e-s
i
ngle-fix' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
erge branch 'jc/rev-list
-
simplif
y
-me
r
ges-first-pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'hv/su
b
module
-
update-
n
uk
e
-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
ano
M
erge
branch 'jk/diff-no-index-page
r
' in
t
o m
a
in
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e
branch 'mm/v
e
ri
f
y-filename-f
i
x'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge bran
c
h 'cn/ch
e
rry-
p
i
c
k-range-docs' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erg
e
branch '
j
c
/
us
t
ar-
c
hecksum-is-uns
i
gned'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C H
a
mano
M
e
rge b
r
anch 'jc/bu
n
dle-complete-notice' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
M
erge bra
n
ch '
j
c/ls-fil
e
s
-
i-d
i
r
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge b
r
anch 'jc/request-pull-match-tag
n
ame' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
ano
Merge branch 'tg/maint-cache-name-
c
ompare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C H
a
m
ano
cache_name_comp
a
re(): do not trunca
t
e while compa
r
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests
f
o
r
t
he
--3w
a
y opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
H
aman
o
filter
-
branch:
do not forget the '@' p
r
efix
t
o force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-p
a
r
se
-
-disambiguate
=
<pref
i
x>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
rev-pars
e
:
A
and
B
in
"
rev
-
parse A
.
.
B" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
reset
:
t
h
e
c
omma
n
d takes committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
commit-tr
e
e:
the co
m
m
and wan
t
s a tree and
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply
:
--build-fake
-
a
n
cestor expects bl
o
bs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
sha1_name
.
c: add su
p
p
o
rt
for disambiguating ot
h
er type
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
revi
s
ion
.
c: the "l
o
g" fa
m
i
l
y
,
exc
e
pt for
"show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c: allow handle_r
e
v
ision_
a
rg() t
o
take
oth
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
s
h
a1_name
.
c: introduc
e
g
e
t_sha1_commit
t
ish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
sha1_name
.
c: teach lookup con
t
ext to
g
et_sha1
_
with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
sha1_n
a
m
e
.
c
:
many short
n
a
mes can only be
c
ommittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_name
.
c: get
_
s
h
a
1_1()
t
a
kes lookup flag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha
1
_name
.
c
: get_describe_nam
e
() by
d
e
finit
i
o
n
gr
o
ks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rere
r
e: make rr-cache fan
o
ut direct
o
ry honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: docum
e
nt --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
allow rerere(
)
to work on --3wa
y
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: re
g
i
s
t
e
r
conf
l
icted s
t
ages
t
o
t
he index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: -
-
3way wi
t
h add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
apply: move verify_index_
m
a
tch
(
) higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: plug the three-w
a
y
merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
apply: fall back on
t
hree-way
m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pp
l
y: accept -3/--3way command l
i
ne option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
ano
app
l
y:
m
ov
e
"alrea
d
y e
x
ists" logic to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
app
l
y:
m
ove
c
heck
_
to_
c
reate_blo
b
() closer to its
s
ole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
ply: fu
r
ther split lo
a
d_p
r
eimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
apply:
r
efactor
"
previous patch
"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
ap
p
ly: s
p
lit loa
d
_preimage() helper function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: factor out c
h
eckout_target()
h
elper functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
appl
y
: refa
c
tor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C Hamano
apply: clear_image(
)
c
lears things a bit mo
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a
b
i
t more comm
e
nts on PA
T
H_TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: fi
x
an incomplete
comment in check_
p
atc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merge git://github
.
com/git-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hama
n
o
Fifth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
g
e branc
h
'cw/help-over
-
network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
Merge
b
ranc
h
'mz/empty
-
reba
s
e-test'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merge b
r
a
n
ch 'pw/
g
it-p4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hama
n
o
Merge branch 'js
/
fast-exp
o
rt-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C H
a
mano
M
e
r
g
e branch
'c
w
/no-deta
c
hi
n
g-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Mer
g
e branch 'vr/use-o
u
r-p
e
rl-in
-
tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mm/credential
-
p
lumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge branc
h
'jc/maint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
b
ranch 'j
n
/per
l
-makemaker-lea
d
ing-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
Merge branch '
r
j
/
platform-pread-ma
y
-
b
e
-thread-unsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge branch 'mm/confi
g
-
xdg
'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
i
o
C
Ham
a
n
o
Fo
u
r
th b
a
tch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C Haman
o
Merge branch 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Ha
m
ano
Merg
e
branch
'
th/d
i
ff-
n
o-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge b
r
a
nc
h
'hv/remote-end-hu
n
g-u
p
'
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
sha
1
_
n
ame
.
c
:
teach get_s
h
ort_
s
h
a
1
() a commit-
o
nl
y
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: allow get_short_sha1() t
o
take other
fl
a
gs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Ha
m
a
n
o
get_sha1():
f
ix error s
t
atus
reg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
uni
o
C Hamano
sha1_name
.
c:
r
est
r
uctur
e
di
s
ambiguation o
f
s
hort name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
sha1_name
.
c: correct misnamed "canoni
c
al" a
n
d "res
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio
C
Hamano
s
h
a1_name
.
c: refactor find
_
shor
t
_packed_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Ha
m
ano
sha1_name
.
c: ren
a
me "now" to "current"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
sh
a
1_name
.
c: clarify what "
f
ake"
is for in find_sho
r
t
_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
h
a
1
_
n
ame
.
c:
ge
t
rid of get_sha1_with_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_
n
a
me
.
c
: g
e
t rid of get
_
sha1_with_mode_1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C
Hamano
S
y
n
c
with i18n-po updates in m
a
i
n
t
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
M
e
rge branch
'
mai
n
t' of git://github
.
com/git-l
1
0n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ham
a
n
o
sha1
_
name
.
c: hide get_sha1_with_cont
e
xt_1(
)
ug
l
iness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Hamano
b
la
m
e: comp
u
te a
b
breviation wi
d
th that e
n
sures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
d
iff-
i
n
dex
.
c: "git diff" ha
s
no need to
r
ead blo
b
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Ham
a
no
diff
-
i
n
dex
.
c
:
u
n
ify handling of comm
a
n
d line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
diff-inde
x
.
c
:
d
o
not pret
e
nd pat
h
s are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next