repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge git://github.com/git-l10n/git-po
2012-07-12
J
u
n
io C Hamano
date
.
c: Fix off by one error
i
n
o
bject-header da
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
t1512: i
g
nore whit
e
spaces in w
c
-
l
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Reduce draft rel
e
as
e
notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ra
n
ch 'jc/maint-blame-unique-abb
r
ev' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch 'rj/
p
latform-pread-may-be-thr
e
ad-
u
nsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'th/diff-no-index-f
i
x
e
s
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e br
a
n
ch 'nd/clone-
s
i
n
g
l
e-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc
/
rev-list-simplify-me
r
ges-first-p
a
rent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'hv/s
u
bmodule-upda
t
e-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge
bra
n
ch 'j
k
/diff-no-index
-
pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Haman
o
M
e
r
g
e
branch 'mm
/
verify-f
i
len
a
me-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
bra
n
c
h
'cn/cherry-pick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge bra
n
ch 'jc/ustar-che
c
k
s
um-is-unsigned' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
a
mano
M
e
r
g
e
b
ra
n
c
h
'jc/bun
d
le
-
complete-
n
o
tice' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge b
r
anch 'jc/l
s
-files-i-dir' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
branch
'jc/request-pull-match-tagname
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch '
t
g/maint-ca
c
he-
n
a
me-compare'
i
nto tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hama
n
o
c
a
che_nam
e
_com
p
are(): do n
o
t tr
u
ncate while comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
app
l
y: te
s
ts for the --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o
C
H
amano
filte
r
-
bra
n
ch:
d
o not
f
orget the
'@' prefix to for
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
rev-parse
-
-
disambig
u
ate=<pre
f
ix>
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-p
a
rse A
.
.
B" re
f
e
r to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
reset:
t
he command
t
akes committ
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
commit
-
tree: the command wa
n
ts a tree
and co
m
mit
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
p
ply
:
--
b
uild-
f
ake-ancestor
e
xpect
s
b
lobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
s
ha1_n
a
me
.
c: add
support
f
or disambiguatin
g
other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
ama
n
o
revis
i
on
.
c: the "log" family, exc
e
pt
for "show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
ano
r
e
vision
.
c: allow ha
n
dle_revision_arg() to take
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
sha1_nam
e
.
c: in
t
roduce get_sha1
_
committ
i
sh()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
sha1_nam
e
.
c:
t
each
l
ookup cont
e
xt to get_s
h
a1_with_cont
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
sha1_name
.
c
:
many sho
r
t names c
a
n o
n
l
y be commi
t
t
i
sh
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 lo
o
kup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sh
a
1_nam
e
.
c
:
get_describ
e
_name() by definition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
rerere: make
rr-cac
h
e fanout directory h
o
nor uma
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
a
pply: docu
m
ent --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
ppl
y
: allow rerere
(
) to
w
o
r
k
on --3way re
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: regist
e
r c
o
nfl
i
ct
e
d
s
tag
e
s t
o
t
h
e
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply:
--3wa
y
with add/add
c
onf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
apply: m
o
ve verify_in
d
ex_mat
c
h(
)
hi
g
he
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
pply:
p
lug
the
thr
e
e-
w
ay
m
erg
e
logic i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
l
y
: fal
l
back on
three-
w
ay merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
pply: accept -3/--
3
way command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
app
l
y: move "already
exists" lo
g
ic to check_to_
c
reate
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply: move
c
heck_to_
c
reate_blob() close
r
to its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
further spli
t
load_preima
g
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply
:
ref
a
ctor "previou
s
p
a
tch"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_preimage()
h
e
l
pe
r
f
u
nction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
H
amano
apply
:
fa
c
tor out che
c
kout_target
(
) hel
p
er function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
apply: r
e
factor read_file
_
or
_
gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Ham
a
no
apply: cl
e
ar_im
a
ge()
c
l
e
a
rs things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
appl
y
: a bit more commen
t
s on PATH_TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: f
i
x an inco
m
plete com
m
ent in c
h
ec
k
_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://g
i
thub
.
com/
g
it-l10n
/
git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Fif
t
h batch
for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge br
a
nch 'c
w
/hel
p
-
o
ver-
n
etwo
r
k'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
e
rge
b
ranc
h
'mz/
e
m
p
t
y-rebase-te
s
t
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge branch 'pw/git-p
4
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
Merge branch 'j
s
/fast-export
-
paths-with
-
spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
an
o
Me
r
ge br
a
nch 'cw
/
no
-
detaching-
a
n
-
unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch '
v
r/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
M
e
rge
branc
h
'mm/cre
d
ential-p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'jc/maint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
M
e
rge
b
r
anch 'jn/perl-ma
k
emaker-l
e
adi
n
g-paths'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
Mer
g
e
branch
'rj/platform-pread-may-be-thread
-
unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge branch 'mm
/
config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
no
Fourth batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
M
erge branch
'
nd/clone-single
-
fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge br
a
nc
h
't
h
/d
i
ff-no-ind
e
x-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merg
e
br
a
nch 'h
v
/remote-end-hun
g
-up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_
n
ame
.
c:
t
each get_short_sha1()
a com
m
it-only op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
i
o C Ha
m
ano
s
h
a1_name
.
c: allow get_s
h
o
rt
_
s
ha1()
t
o
take
o
t
he
r
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hamano
get_sha1(): fix erro
r
sta
t
us regress
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: rest
r
u
cture disamb
i
g
u
a
tion of short
na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
ni
o
C Hamano
sha1
_
n
ame
.
c
:
correct misnamed "canoni
c
al"
a
nd "r
e
s"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
Ham
a
no
sha1_name
.
c: re
f
actor fi
n
d_short_packed_ob
j
ect()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
s
ha1_name
.
c: re
n
ame "now" to "
c
u
r
r
ent"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C H
a
mano
sha1
_
name
.
c: clarify wh
a
t "fake
"
is for in
f
ind_short_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_n
a
m
e
.
c: get r
i
d
of get_sha1
_
with_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio
C
Hamano
sha1_name
.
c: get rid o
f
get
_
sha1_with_mode_1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hama
n
o
S
y
nc with i18n-po updates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hama
n
o
M
e
rge branch 'maint' of git://gith
u
b
.
com/git-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
mano
s
h
a1_name
.
c: hide get_sh
a
1_with_context_1(
)
ugli
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
a
m
ano
blame:
co
m
put
e
ab
b
reviation width that ensures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
m
a
no
d
i
ff-index
.
c
:
"git diff" has no need
to
r
ead blob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
diff-index
.
c: unify handling
of com
m
and l
i
n
e
pa
t
hs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
diff-index
.
c: do not pret
e
nd pat
h
s
are paths
p
ec
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Ham
a
no
Third batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C
H
amano
Merge
branch 'fc/git-pro
m
pt-
s
cript'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
a
n
o
Merge branc
h
'js/
s
ubmo
d
ule-relative'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io
C Ha
m
ano
M
erge b
r
anc
h
'
l
k/more-h
e
l
pful-
s
ta
t
us-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
M
e
rge
branch 'lk/rebas
e
-i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
un
i
o C Ha
m
an
o
Merge
branch 'jc/
r
ev-lis
t
-simplif
y
-merges-fi
r
st-pa
r
ent'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C
Ha
m
ano
Merg
e
branch 'h
v
/submodule-upda
t
e
-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hama
n
o
Merge bra
n
ch '
n
d/exc
l
ud
e
-w
o
rkaround-to
p
-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
e
rge bran
c
h 'nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
Merg
e
bra
n
ch 'nd/stre
a
m-ind
e
x-pack'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge branch
'mm/verify-file
n
ame-f
i
x'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
M
erg
e
br
a
nch 'jk/
d
iff-no-index-pager'
commit
|
commitdiff
|
tree
next