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 branch 'jn/makefile-cleanup'
2012-07-16
Junio C Hamano
M
e
rge bran
c
h 'jn/makefil
e
-cleanu
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Haman
o
Merge branch 'ar/clone-honor-umask
-
a
t
-
t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
M
erge bra
n
c
h
'
jc/
a
pply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
M
e
rg
e
branch
'
cw/reba
s
e-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge bra
n
ch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C Hamano
Merge branch
'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
Hamano
Merge branc
h
'jk/push-delete-ref
-
e
r
ror-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merge bran
c
h 'jc/
r
efactor-diff-s
t
d
in'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge branch 'tb/sanitize-
d
ecompo
s
ed-utf
-
8-pathname
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
mano
Merge
branch '
m
m/mediawi
k
i-tests'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C Ham
a
no
Merge branch 'jn/vcs
-
svn'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C Hamano
Merge br
a
nch 'mm/m
e
diawiki-file-
a
ttach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
M
erge bra
n
ch 'tr/maint-show-w
a
lk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge br
a
nch
'm
z
/r
e
base-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
R
educe draft r
e
leas
e
notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync
wi
t
h 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Gi
t
1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
a
nch
'
jc/ma
i
nt-blame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
M
er
g
e
b
ranch
'
rj/pl
a
tform-pread-may-be-thread-u
n
s
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
Merge
branch 'th/dif
f
-no-index-fixe
s
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
M
e
rge bran
c
h '
n
d
/
clone-si
n
gle-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Haman
o
Merge br
a
nch '
j
c/rev-list-simplify-merges
-
f
ir
s
t-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hamano
Me
r
g
e branch 'hv/sub
m
o
d
ule-update-nuke-subm
o
d
u
les'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branc
h
'jk/diff-no-
i
ndex-pa
g
er'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'mm/verify-
f
i
l
ename-fix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Ha
m
ano
Merge branch
'cn/c
h
erry-pick-rang
e
-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C Haman
o
M
e
rge bra
n
ch '
j
c/
u
star-chec
k
sum-is
-
unsigne
d
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch
'
jc/bundle-co
m
plete-notice' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'jc/ls-files-i-dir' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
M
e
rge branch 'jc/request
-
pull-match-tagn
a
me
'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ham
a
no
a
pply: t
e
sts for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
r
erere: ma
k
e
rr-cache fanout
directory h
o
nor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
apply:
d
ocument -
-
3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
apply:
a
ll
o
w rere
r
e() to work on
--3wa
y
r
e
sults
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: reg
i
ster confli
c
ted
stages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
apply: --3way wit
h
add/add con
f
lict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
ply: move verify_inde
x
_
m
a
tch
(
) highe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: plug the three-way merg
e
logi
c
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
a
p
ply: fall bac
k
on
t
h
ree-way
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply
:
acce
p
t -
3
/--3way comman
d
lin
e
opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
ap
p
ly: mov
e
"al
r
eady
exists" logic t
o
check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: move ch
e
ck_to_
c
reate_blob() closer to it
s
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
ap
p
ly: furth
e
r split load_p
r
eimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C Ham
a
no
apply: re
f
actor "previous
p
atch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply
:
split load_preimage() helper
function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
appl
y
: fa
c
tor o
u
t chec
k
out_target() helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply:
refactor r
e
a
d_fil
e
_or_git
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
ap
p
ly: clear_image
(
) clears things a b
i
t more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
a
p
ply: a bit more comments on PATH_TO_B
E
_
DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: fi
x
an
incomplete
commen
t
in c
h
eck_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
Merge g
i
t://gi
t
hub
.
com/git-l10n/g
i
t-
p
o
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
Fifth bat
c
h
f
or 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
Me
r
ge bra
n
ch 'cw/help-ove
r
-
network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Mer
g
e branch 'mz/
e
m
p
ty-rebas
e
-test'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge
branch 'pw
/
git-
p
4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Ham
a
n
o
M
erg
e
branch
'
js/f
a
s
t-export-paths-wi
t
h
-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
Merge
b
ranch '
c
w/no-detach
i
ng-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch 'vr/use-our-pe
r
l-in-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merge
b
ranch 'mm
/
credential-plumb
i
ng'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Mer
g
e branch 'jc/ma
i
nt-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
Me
r
g
e
b
r
anch 'jn
/
p
erl-
m
akema
k
er-leading-path
s
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
m
a
n
o
M
erg
e
branch 'rj/pl
a
tfor
m
-pre
a
d-m
a
y-be-
t
hread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge branch
'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
Fo
u
r
t
h
b
a
tch
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Haman
o
Merge br
a
nch 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Hamano
Merge branch 'th/dif
f
-
no-index-fix
e
s'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C Haman
o
Me
r
g
e
bra
n
ch 'h
v
/remote-end-hung
-
up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
mano
Sync with
i18
n
-po
u
pdates i
n
m
a
int
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ha
m
ano
M
e
rge branch 'maint' of git://github
.
com/git-l10n
/
git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C
H
amano
blame: compu
t
e
a
b
breviation w
i
dth t
h
at ensur
e
s
unique
n
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-inde
x
.
c:
"
git di
f
f
"
has
n
o nee
d
to read blob
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C
Hamano
d
iff-index
.
c
: uni
f
y handling
o
f
command
line p
a
ths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
am
a
no
diff-index
.
c: do
n
ot pre
t
end paths are pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
an
o
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 Hamano
Me
r
ge
bran
c
h 'fc/git-prompt-s
c
ri
p
t'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merg
e
branch 'js/
s
ubm
o
dule-r
e
lative'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge branch 'lk/more-helpful-status-hints
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
branch '
l
k/reb
a
se
-
i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
m
ano
Merge bra
n
c
h
'
j
c/rev-list-simpli
f
y-merges
-
fir
s
t
-pa
r
en
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
branch 'h
v
/submodule-updat
e
-nuke-s
u
bmod
u
les'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
b
ranch 'nd/ex
c
lude-workaround-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Haman
o
Merge b
r
anch 'nd/stream-
p
ack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e branch
'nd/stream-in
d
ex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge bra
n
c
h
'mm/ver
i
f
y
-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge bran
c
h 'jk/diff-
n
o-ind
e
x
-
p
ag
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Junio C
H
a
m
ano
i
ndex-pack: Disable th
r
eading on cygw
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
Sec
o
nd ba
t
ch fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C H
a
mano
Merge branch
'l
p
/no-cm
d
-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Merge bra
n
ch 'cn/cherry-pi
c
k-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
branch 'lm/git
-
blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'rs/ipv
6
-ssh
-
url
'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
H
aman
o
Merge branch
'
jc/ustar-checks
u
m-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Merge branch
'
r
s/git-blame-mapcar-m
a
pc'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hama
n
o
M
e
r
ge b
r
an
c
h 'rr/doc-commit'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
i
o
C Hamano
Merge branch 'nd/i18n-m
i
sc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge branch 'nd/i
1
8n
-
b
ranch-l
e
go'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
M
erge branch 'jk/no
-
more-asc
i
idoc7'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
M
erg
e
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
next