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
i18n: merge-recursive: mark strings for translation
2012-07-16
Junio C Ham
a
no
Update draft release notes f
o
r 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o
C Hamano
Merge bra
n
ch 'tg
/
ma
i
nt-cache-name-compare
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge branch 'j
k
/
i
n
d
ex-pack-streaming-fi
x
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
M
e
rge branch
'jk/m
a
int-commit-ame
n
d-onl
y
-n
o
-paths'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Merge branch
'
cw/amend-commit-withou
t
-messa
g
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge b
r
anch 'jn/mak
e
file-c
l
ean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
e
rge bra
n
ch 'ar/clone
-
h
o
n
or
-
umas
k
-at
-
top'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C H
a
mano
M
erge branch 'jc/apply-3
w
ay'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
a
m
ano
Merge branch 'cw/rebase-
i
-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Mer
g
e branc
h
'pw/
g
it-
p
4
-
move
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C H
a
man
o
Merg
e
branc
h
'
jk/pus
h
-d
e
lete-ref
-
e
rror-message'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Ha
m
a
n
o
S
i
x
th batch fo
r
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C
H
amano
M
erge branch 'jc/refactor-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hama
n
o
Merge
b
ranch 'tg/ce-na
m
el
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
M
erge bra
n
ch 'tb
/
s
anitize-
d
ecom
p
ose
d
-utf-8
-
pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
M
erge branc
h
'mm/med
i
awiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'jn/v
c
s-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Merge branch 'mm/media
w
iki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Haman
o
Merge branch 'tr/maint-show-walk
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch
'
mz
/
re
b
ase-
n
o-m
b
ox'
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hama
n
o
Reduce d
r
aft r
e
lease notes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Syn
c
with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Git
1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/maint-blame-unique
-
abbrev' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge bra
n
ch '
r
j/p
l
at
f
orm-pread-may-be-thre
a
d-uns
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hama
n
o
M
e
rge
branch 'th/dif
f
-
no-index-fi
x
es' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge branc
h
'nd/
c
lone-single-fix'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch
'
jc/rev-list-simplif
y
-merge
s
-fir
s
t-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merge
branch 'h
v
/submodule-u
p
date-nuke-subm
o
d
u
les
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
aman
o
Merge branch 'jk/
d
if
f
-no-
i
ndex-pager' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge bra
n
c
h 'mm/ve
r
i
fy
-
filename-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge bran
c
h
'cn/che
r
ry-pick-range
-
d
o
cs' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'jc/ustar-c
h
ec
k
sum-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
er
g
e branch 'j
c
/bundle
-
c
omp
l
e
t
e-no
t
ice'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Me
r
ge branch '
j
c/ls
-
files-i-di
r
' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branch 'jc/req
u
est-pull-match-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
cache_nam
e
_c
o
mpar
e
(): do not
t
runcate
while
c
omparin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
Ham
a
no
apply: tes
t
s for the --3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: make rr-cache fanout directory
h
onor
u
m
a
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
apply: docum
e
nt --
3
wa
y
opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: allo
w
rerere() to
work on --3way
r
esults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: register conflicte
d
stages to
t
he index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
ppl
y
: --3way with add
/
add
c
onflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
am
a
no
apply: move
verify_i
n
dex
_
ma
t
ch(
)
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Ha
m
ano
appl
y
: plug the thr
e
e
-
w
ay merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
apply:
f
all back
on
three-w
a
y merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: acce
p
t -3/--3way
c
o
m
ma
n
d line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
a
p
pl
y
:
move "al
r
eady exists" logic to check_
t
o_crea
t
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
am
a
no
a
pply: move check_to_crea
t
e_
b
lob() closer to its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: furthe
r
split load_
p
reimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: r
e
f
a
c
tor
"prev
i
ous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
appl
y
: s
p
l
it load_preimage
(
)
hel
p
e
r functio
n
ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: factor ou
t
checkout_target()
h
e
lper fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor
r
ead_file_o
r
_
g
itli
n
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
a
pply:
c
lear_im
a
ge() clears thi
n
gs
a bit
m
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
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: fix an incomplete
comment in
c
h
eck_patch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://github
.
com/git-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Fifth
b
atc
h
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge branch 'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
Me
r
ge br
a
nch 'mz/emp
t
y
-
rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'pw/git-p4
-
te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
Merge br
a
nch 'js/fa
s
t-ex
p
ort-pa
t
hs-with-sp
a
c
es'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Mer
g
e bra
n
ch 'cw/no
-
de
t
aching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
Me
r
ge branch 'vr/use-
o
ur
-
perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Me
r
ge branch 'm
m
/c
r
edent
i
al
-
pl
u
mbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge branch 'jc/maint-blame-unique-abb
r
e
v
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
M
erg
e
branch 'j
n
/perl-makemak
e
r-
l
eadi
n
g-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
e
rge branch 'rj/platf
o
rm-pread-may-be-thr
e
ad-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Ha
m
ano
Me
r
ge branch
'
m
m/
c
onfig-
x
dg'
commit
|
commitdiff
|
tree
2012-07-05
J
un
i
o C Hamano
F
o
u
r
th batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge bra
n
ch 'nd/clone-s
i
ngle-fi
x
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge
b
ranch 'th/diff-n
o
-index-
f
ixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'hv/remote-end-hung-up
'
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
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
Hamano
Merge
branch 'maint'
o
f git://github
.
c
om/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Hamano
bl
a
me
:
compute abbreviation wi
d
t
h
that ens
u
res
unique
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff
-
in
d
e
x
.
c
: "git diff"
has
no need to r
e
a
d
b
lob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Ha
m
a
n
o
diff-ind
e
x
.
c: unify handling
o
f
c
o
mmand line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
diff-i
n
dex
.
c:
d
o
not p
r
eten
d
paths
a
re pa
t
hspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio
C
Hamano
Third bat
c
h fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io
C Hamano
Merge
b
r
a
nch 'fc/gi
t
-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Ha
m
ano
M
erge branch 'js/
s
ubmodule-rela
t
ive'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branch 'lk/more-helpf
u
l
-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Ha
m
ano
M
e
r
g
e branc
h
'lk/reb
a
se-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
M
erge branch 'jc/rev-list-
s
implif
y
-merges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Mer
g
e
br
a
nch 'hv/s
u
bmo
d
ule-u
p
date-nuke-sub
m
odule
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge b
r
anc
h
'nd/ex
c
lude-workar
o
und-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch '
n
d/s
t
ream-p
a
ck-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge
br
a
nch
'n
d
/stream-index-pac
k
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch '
m
m/verify-f
i
lename-fix'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branch 'jk/
d
iff
-
no-ind
e
x-pag
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
index-pack:
D
isable
t
hreading on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Second batch f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Haman
o
Merge branc
h
'l
p
/
n
o-cm
d
-ht
t
p-f
e
tc
h
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge branch 'cn/cher
r
y-pick-range-doc
s
'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C
Hamano
Merge
b
r
a
nch
'
lm/
g
it-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
anc
h
'rs
/
i
p
v6
-
s
s
h-u
r
l'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge bra
n
c
h
'jc/ustar-checksum-is-unsigned'
commit
|
commitdiff
|
tree
next