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
unio C Ha
m
an
o
date
.
c
:
Fix
off by one error in object-head
e
r date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Hamano
t1512:
igno
r
e whi
t
espaces i
n
wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Reduce draft
r
elease notes to
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hama
n
o
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
no
Merge branch
'
jc/mai
n
t-
b
l
ame-unique-a
b
brev' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
M
er
g
e branch 'rj/platform-p
r
e
ad-
m
ay-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
t
h/dif
f
-
n
o-index-fixe
s
' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'nd/clon
e
-single-
f
i
x' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branc
h
'jc/rev-list-simplif
y
-m
e
rges-first-pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C H
a
mano
Me
r
ge
branch 'hv/sub
m
odule-update-nuke-subm
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge b
r
anch 'jk/diff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
M
e
rg
e
branch 'mm
/
verify-filenam
e
-f
i
x' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e bran
c
h 'cn/cher
r
y-pi
c
k-range-docs' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
r
a
n
ch
'
jc/us
t
ar-checksum-is-u
n
signed' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
M
e
rge
b
r
anch 'jc/
b
undle-co
m
p
lete-
n
o
tice' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge br
a
nch 'jc/
l
s-files-i-dir' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
ma
n
o
Merge b
r
anch 'jc/request-pull
-
match-tagnam
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
ranch 'tg/maint-cache-nam
e
-
c
o
m
p
a
re
'
i
n
t
o tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_name_compare(): do not truncate whil
e
compa
r
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
uni
o
C Ha
m
ano
apply: tests f
o
r the --
3
way
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Hamano
filter-branch: do no
t
forget the '@' prefix to fo
r
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
rev-parse
--di
s
ambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
rev-parse: A a
n
d B in "rev-parse
A
.
.
B" refer to
committis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
reset: th
e
command take
s
com
m
ittis
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
co
m
mi
t
-t
r
ee
:
t
h
e
c
omm
a
n
d
wa
n
ts a tre
e
and
comm
i
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
Hama
n
o
appl
y
:
-
-build-fake-
a
ncest
o
r expect
s
b
lobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_n
a
me
.
c: ad
d
sup
p
ort
for
disambiguating ot
h
e
r types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
revision
.
c:
t
he "
l
og"
family, except
f
o
r
"show
"
,
t
akes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
revi
s
ion
.
c: allow handle_r
e
vision_arg() t
o
take
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
sha1_
n
ame
.
c: introdu
c
e
get
_
sha1_c
o
m
m
ittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
s
ha1_name
.
c: teach lookup
c
on
t
ext to get_sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
s
h
a1_name
.
c: many short names can
on
l
y be committi
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_sha1_1() t
a
k
e
s look
u
p flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
sha1_name
.
c
:
get_d
e
sc
r
i
b
e_name(
)
by definition
groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hama
n
o
re
r
ere:
m
ake r
r
-cache fano
u
t dire
c
tory h
o
nor
u
mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: d
o
cumen
t
--3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: al
l
ow re
r
ere() to work on
-
-3
w
a
y
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: regis
t
er conflicted stages t
o
t
he index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Hamano
appl
y
:
-
-3w
a
y with
a
dd/add conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: move verify_
i
ndex_match() hi
g
her
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: plug the three-way merge log
i
c
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
appl
y
:
f
all back o
n
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: accept -3/--3w
a
y command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply: move "already exists" logic to
c
heck_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: move che
c
k_
t
o_create_
b
l
o
b()
c
l
o
ser to its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
apply: fu
r
the
r
sp
l
it
load_pr
e
i
m
age()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: refactor "previou
s
patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: spl
i
t
l
o
ad_preima
g
e(
)
h
e
lper functio
n
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
a
pply:
factor out checko
u
t
_tar
g
e
t
() hel
p
er funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
r
efactor read
_
f
i
l
e_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply: clear_image() clears t
h
ing
s
a bit
m
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply: a bit more comments on PATH_TO_BE_DELET
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
app
l
y
: fix
an inco
m
p
l
ete comm
e
nt in check_p
a
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Me
r
ge git://gi
t
hub
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Fi
f
th batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Me
r
g
e
b
r
anch 'cw/hel
p
-ove
r
-ne
t
w
or
k
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mz/em
p
t
y-
r
e
b
ase-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge
branc
h
'
pw
/
git-p4-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
Me
r
ge
branch 'js/
f
ast-export-paths-with-s
p
a
c
es'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bran
c
h 'c
w
/no-detac
h
ing-an-
u
nborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'vr/use-
o
ur-
p
erl-in-tes
t
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
g
e
branch 'mm/creden
t
ial-p
l
umb
i
n
g
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Me
r
ge b
r
anch 'jc/ma
i
nt-
b
lam
e
-uniq
u
e-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge branch 'jn/
p
erl-makemaker-leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
Mer
g
e
b
ranc
h
'rj/pl
a
tform-pread
-
may-be-thread-
u
nsa
f
e
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branc
h
'mm/co
n
fi
g
-
x
dg'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C Hamano
Fourth batc
h
for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge
b
r
a
nch 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C
H
amano
Merge branch 'th/dif
f
-no-in
d
ex-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C Hamano
M
e
rge branch 'hv/re
m
ot
e
-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
i
o C Hamano
s
h
a
1_n
a
me
.
c:
te
a
ch get_sho
r
t_
s
h
a
1
(
) a commit-only o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C
Ham
a
no
sha
1
_name
.
c:
allow get_short_sha1() to take o
t
her flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
get_sha1():
fix error status
r
eg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
sha1_name
.
c
:
restruct
u
re disambigua
t
ion
o
f short n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
H
a
mano
s
h
a1_name
.
c: correct misname
d
"can
o
ni
c
a
l" and "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
a
n
o
sha1_name
.
c: refactor find_shor
t
_pa
c
ked_ob
j
ect()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha
1
_name
.
c: re
n
ame "
n
ow"
to "
c
urr
e
nt"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_name
.
c
:
clarify
w
hat "fake"
i
s for in find_sh
o
r
t_obje
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c
: get rid of get_sha
1
_with_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C
H
amano
sha1_name
.
c: get
r
id
o
f
get_sha1_with_
m
ode_1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hama
n
o
Sync with i1
8
n-po u
p
dates in ma
i
nt
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Haman
o
M
erge
b
ra
n
ch 'maint
'
of git://g
i
thu
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Ha
m
ano
sha
1
_name
.
c: hide ge
t
_sha1_with_context_1() ugl
i
n
e
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
blame: compute abbreviati
o
n
w
i
dth
that
ensures
u
ni
q
ueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
diff-index
.
c:
"
git diff" has
no n
e
ed to read blob
f
ro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
n
o
diff-i
n
dex
.
c: unify handli
n
g of command line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
diff-inde
x
.
c:
do not pretend p
a
ths ar
e
paths
p
ecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Third batch
f
or
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'fc/git-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
branch 'js/
s
ubmodule-re
l
at
i
ve'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
erg
e
branch 'lk/more-helpf
u
l-statu
s
-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge bran
c
h 'l
k
/reba
s
e-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
erge branch
'
jc/
r
ev-list-simpl
i
fy-merges-first-paren
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Merge bra
n
ch '
h
v/
s
ubmodule
-
update-nu
k
e-submod
u
les'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
n
o
Merge
br
a
nch
'
n
d
/
exc
l
ude-workaround-
t
op-heavy'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C
Ha
m
a
n
o
Merge branch 'nd/st
r
eam-pack-object
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'nd
/
str
e
am-ind
e
x-p
a
ck'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Me
r
ge branch 'mm
/
v
eri
f
y-f
i
l
e
n
ame-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branc
h
'jk/dif
f
-no-index-pag
e
r'
commit
|
commitdiff
|
tree
next