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
Juni
o
C Ha
m
ano
Update draft re
l
ea
s
e
notes fo
r
7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merg
e
branc
h
'tg/ma
i
nt-cache-
n
ame-
c
om
p
are'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
M
e
rge bra
n
ch 'jk/ind
e
x-pack-strea
m
ing-fix'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C
Hamano
Merge
b
ranch 'jk/ma
i
nt-commit-amend-only-no-p
a
ths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge
branch 'cw/am
e
nd-c
o
mmi
t
-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bran
c
h 'jn/makefile-cle
a
nup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e bra
n
ch 'ar/clone-honor-umask
-
at-t
o
p
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge bra
n
ch
'j
c
/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
M
e
rge branch 'cw/rebase-i-
r
oot'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Haman
o
Merge branch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merg
e
branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
u
n
i
o
C Ham
a
no
Merge b
r
anch 'jk/push-delete-r
e
f-error-m
e
s
sage'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
man
o
Sixth ba
t
c
h
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'jc/refactor-diff
-
stdin'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ham
a
no
Merge
b
r
a
n
ch 't
g
/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Ha
m
ano
Mer
g
e branch 'tb/sanitize-deco
m
posed
-
utf-8-p
a
thname'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Ham
a
no
Me
r
ge branch
'mm/mediaw
i
ki-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
J
un
i
o C H
a
m
a
no
Merge b
r
a
n
ch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Mer
g
e branch
'mm/me
d
iawiki-fil
e
-attac
h
ments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch '
t
r/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branc
h
'mz/rebase-
n
o-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Reduce draft release notes
to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
S
y
nc
with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C
Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merg
e
b
r
a
nch '
j
c/maint-blame
-
unique
-
a
b
b
r
ev' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Hama
n
o
Merge branch 'rj/platform-pread-may-be-thread-uns
a
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Mer
g
e branch 'th/d
i
ff-no-
i
ndex-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
erge branch '
n
d/clon
e
-single-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o C Hamano
Merg
e
b
ranch
'
j
c
/re
v
-li
s
t-sim
p
lify-m
e
rges-
f
ir
s
t-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge bra
n
ch 'hv/submodul
e
-
u
p
d
ate-
n
uke-subm
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'jk/diff-no-inde
x
-p
a
g
er' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm/verify
-
f
ilena
m
e-f
i
x
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge br
a
n
ch
'c
n
/
c
herry-pi
c
k-rang
e
-docs'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Merge branc
h
'
j
c/ustar-checksum-
i
s
-unsigne
d
' into
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'jc/bundle-complete-not
i
ce' int
o
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge branch 'jc/ls-f
i
les-
i
-dir' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
a
n
o
Merge branc
h
'jc/
r
eq
u
est-pull-m
a
tch-tag
n
ame' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
cache_name
_
compare(): do not
t
runcate
w
h
ile
co
m
paring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C Hamano
a
p
ply: tests
f
or the --3wa
y
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
rerere: make rr-cache f
a
no
u
t
directory
honor u
m
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: document --3wa
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
apply: allow rerere()
t
o wo
r
k on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply:
r
e
g
i
s
t
e
r confli
c
ted
stages to the
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
appl
y
: --3
w
ay with add
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply
:
move verify_index_mat
c
h(
)
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply
:
plug t
h
e three-way merge logic
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
an
o
a
p
p
l
y
: fa
l
l back on
t
h
r
ee-way mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
a
pp
l
y: accep
t
-3/--3way com
m
and line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
apply: move "alrea
d
y exists" logic to check_to_
c
r
e
ate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
apply: move
chec
k
_to_create_blob() clo
s
e
r to its
s
ol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
ap
p
ly: fu
r
ther s
p
lit load_p
r
eimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: refactor "previous patc
h
"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
H
amano
apply: spl
i
t load_preimage() helper
f
un
c
t
i
on out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
no
a
pply: f
a
ctor ou
t
checkou
t
_target() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
app
l
y: r
e
f
actor read_file_
o
r_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
cle
a
r_image(
)
cl
e
ars th
i
ngs a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a
bit mor
e
c
omments
o
n PATH_T
O
_BE
_
DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C
H
amano
a
p
p
ly:
fix an incomplete c
o
m
m
ent
i
n check_patch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
Mer
g
e
g
it://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
m
a
no
Fifth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge br
a
nch 'cw/help
-
over-n
e
t
w
ork
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge bra
n
ch 'mz/empty-reb
a
se-test'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Merge branch 'pw/g
i
t-p
4
-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
br
a
nch 'js/fast-export-
p
ath
s
-wi
t
h
-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
Merg
e
branch 'cw/
n
o-detaching-an
-
u
n
born'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch 'vr/use-our-perl-in-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
Merge bran
c
h 'mm/credential-plum
b
ing
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
M
e
rge branch 'jc/maint-
b
lame-uniq
u
e
-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'jn/perl-makemaker-leading-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
M
e
rge bran
c
h
'rj
/
platform-pread-may-
b
e-thread-uns
a
fe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
br
a
nch 'm
m
/
c
onf
i
g-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourth batch
f
o
r
1
.
7
.
1
2
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-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Me
r
ge branc
h
'th/diff-no-i
n
dex-fixe
s
'
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Hamano
Merge branch 'hv/remote
-
end-hun
g
-up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Sync with i1
8
n-
p
o u
p
dates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
J
u
n
io C Haman
o
Merg
e
branch 'm
a
int'
o
f git
:
/
/
g
ithub
.
co
m
/git-l10n/
g
it
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C H
a
mano
blame: compute
a
bbr
e
viat
i
o
n
width that
e
n
su
r
es uniquenes
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C Hamano
diff-
i
ndex
.
c
: "git diff" has n
o
need to
read blob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C Hama
n
o
diff-i
n
d
ex
.
c:
u
nify handling of command line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
un
i
o C Hama
n
o
diff-i
n
dex
.
c: do no
t
pret
e
nd paths are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Th
i
rd bat
c
h
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
un
i
o C Hamano
Merge branch 'fc/git-
p
r
om
p
t-
s
cript'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io
C
Hamano
Merge bra
n
ch 'js/submodule-rel
a
t
i
ve'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e bra
n
ch '
l
k/
m
ore-helpful-
s
ta
t
us-hints'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Ha
m
a
n
o
Me
r
ge branch 'lk/rebase-i-
x
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Me
r
ge branch '
j
c/rev-list-simplify-merges-first-parent
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Me
r
ge
b
ranch
'
hv/su
b
mod
u
le-update-nuke
-
submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
e
rge branch
'
n
d/excl
u
de-workaroun
d
-top-hea
v
y'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
branch 'nd/st
r
eam
-
pack-objects
'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C
Ham
a
no
Me
r
ge
b
r
a
nch
'
nd/stream-index-pack
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge bran
c
h 'mm/v
e
rify-filename
-
fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e
bran
c
h 'j
k
/
d
iff-no-index-pager'
commit
|
commitdiff
|
tree
2012-06-26
Juni
o
C
Hamano
index-
p
ac
k
: Disable threading on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
Second batc
h
f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
M
erge
branch '
l
p/no-
c
md-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
H
amano
Merge br
a
nch '
c
n/cherry-p
i
ck
-
range-docs
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
ama
n
o
Merg
e
branch '
l
m/git-blam
e
-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'rs/ipv6
-
ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
M
e
rge bran
c
h 'jc
/
usta
r
-checksum-is-
u
nsigned'
commit
|
commitdiff
|
tree
next