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 'jk/maint-commit-amend-only-no-paths'
2012-07-16
Jun
i
o
C Hama
n
o
M
e
r
g
e branch 'jk/maint-commit-a
m
end-only-
n
o-paths'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hama
n
o
M
e
rge branch '
c
w/ame
n
d-co
m
mit-w
i
t
hout-message'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C
H
a
mano
Merge
b
ranch 'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C Hamano
Merge branch 'ar/clone-honor-umask
-
at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
r
anch
'
jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
M
er
g
e b
r
anch 'cw/re
b
ase-i-r
o
ot'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branc
h
'pw/git-p
4
-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C H
a
ma
n
o
Merge bran
c
h 'jk
/
push-delete-ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Sixth batch f
o
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Merge branch 'jc/r
e
fac
t
or-dif
f
-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branc
h
'tg/ce-name
l
e
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
M
erge branch 'tb
/
sani
t
i
z
e-decomposed-utf-8-
p
athname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
m
a
no
Merge br
a
nch 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
H
a
mano
Merge
branch
'
jn/vcs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
uni
o
C
Ha
m
ano
Merge branch 'mm/me
d
iawiki-fil
e
-attachme
n
t
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
er
g
e branch 't
r
/maint-show-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
M
e
rge branch 'mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-12
G
a
ry Gibbons
git p4: add suppor
t
f
o
r
'p4 move' in P4Submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Re
d
uce draft release 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
Junio C Ha
m
ano
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
n
o
Merge branch 'jc
/
maint-
b
l
a
me-unique-abbrev' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merg
e
bra
n
c
h 'rj/platform
-
pread-ma
y
-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'th/diff
-
no-ind
e
x-fixe
s
' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
mano
Merge bra
n
c
h 'nd/clone-si
n
gle-fix
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
a
m
ano
Merge b
r
anch 'jc/rev-list-simplify-
m
er
g
es
-
first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge branch 'hv/submodule-up
d
a
te-nuke-subm
o
dules
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch 'jk/diff
-
no
-
index-pager' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Haman
o
Merge
b
ranch
'
mm
/
verify-filename-fix' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
r
anch 'cn/ch
e
rry-pick-range-docs' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
amano
Mer
g
e
b
ranch 'jc/ust
a
r-c
h
e
ck
s
um
-
is-unsigne
d
' i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
M
erge branch 'jc/bun
d
le-com
p
lete-notice' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge bran
c
h
'
jc/ls-files-i-
d
ir' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hama
n
o
Merge
branch 'jc/request-pull
-
match-tagname' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
co
m
mit: fix
"
-
-
amen
d
--only" with no pathspe
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Hamano
app
l
y
: tests for
t
he -
-
3wa
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
add:
c
r
eate ADD_EDIT
.
patch
with m
o
d
e
0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
re
r
e
re:
m
ake
r
r-cache fano
u
t direc
t
o
r
y hon
o
r u
m
as
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: d
o
cument
--
3
way op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: allo
w
rerere
(
) to
w
ork on
-
-3
w
ay
r
es
u
lts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
pply: regis
t
er
c
onflicted sta
g
es to the i
n
d
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: --3wa
y
wit
h
add/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply:
m
ove verify_index_m
a
t
c
h() h
i
gh
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
apply:
plug the th
r
ee
-
way merge logi
c
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: fall back on three-way m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C
H
amano
apply: accept -3/--3way command
line opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply: move "already
e
x
i
sts" logic to check_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: mov
e
chec
k
_to_cr
e
a
t
e
_blob() closer
to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply:
f
u
rther split l
o
a
d
_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: refactor
"previous patch" logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: spl
i
t l
o
ad
_
p
reimage() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
ply: fac
t
o
r
o
u
t
chec
k
o
ut_
t
a
r
g
et(
)
helper fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: re
f
actor read_file_
o
r_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: clear_image() clears things a bit mo
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: a bit
m
ore
c
omments on PATH_TO_BE
_
D
E
LETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
man
o
apply: fix an incomplete
comme
n
t in ch
e
ck_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riese
n
R
estore umasks influence on the
permissions of work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Allow ed
i
t
of
empty message with commit --amend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C
H
amano
Merg
e
git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Fifth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rg
e
branch 'cw/help-
o
ver-n
e
twork'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
Merge bra
n
c
h
'mz/empty-r
e
ba
s
e-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
r
g
e branch
'pw
/
git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'js/
f
ast-ex
p
ort-p
a
ths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/
n
o-detaching-a
n
-unb
o
rn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
M
e
rge branc
h
'
v
r/use-our-perl-in
-
tests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge
branch 'mm/cred
e
n
tia
l
-p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branc
h
'
j
c/
m
aint-blame-unique-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hama
n
o
Mer
g
e branch 'jn/perl
-
m
a
k
e
maker-le
a
ding-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'rj/
p
latfo
r
m-pre
a
d-may-be-thread
-
unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
Merge branch 'mm/config
-
xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Ma
k
efile: document ground ru
l
e
s for t
a
rge
t
-spe
c
i
f
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f King
Makefi
l
e: move GIT-
V
ERS
I
ON-FILE dependenc
i
es closer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: build instaweb s
i
m
i
lar
to
o
ther
scr
i
pts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: u
p
date scripts when b
u
i
l
d-
t
ime
p
arameters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
M
a
kefile: do not replace @
@
GIT_VERS
I
ON@@ in shell
scri
p
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f King
M
a
kefile: split pre
f
i
x
flags from GIT
-
CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jona
t
han Nieder
Makefile: be sile
n
t when only GIT_US
E
R
_
AGENT changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: split GIT_USER_AGEN
T
from GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: do not replace @@
G
IT_USER_AGENT@@
in
scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Make
f
i
l
e:
apply dependencies consi
s
tently t
o
sparse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
Makefile: do no
t
have git
.
o
depen
d
on
c
o
m
mon-cmds
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefile: fol
d
XDI
F
F_H and VCSSVN_H
into LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Torsten Bögersha
u
sen
g
i
t on Mac OS
and precomposed u
n
icode
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Thomas
G
umm
e
re
r
Replace strlen() with ce_n
a
melen()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu
M
o
y
git-remote-m
e
diawiki: up
d
ate
c
omments to reflect cr
e
dential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
atthieu Moy
git-remote-mediawiki:
be more defensive when requests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
a
t
thie
u
Moy
g
it-rem
o
te-m
e
diawik
i
: more effic
i
ent 'pull' i
n
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remo
t
e
-
mediawiki: extract revision-
i
m
p
ort
i
ng
l
oop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
e
u
Moy
g
i
t-remo
t
e-m
e
diawiki: refactor
l
oop
ov
e
r r
e
vision ids
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthie
u
Moy
git-
r
emote-mediawiki: c
h
ange
r
eturn type of get_mw_page
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NGUY
E
N K
i
m Thuat
git
-
remote-m
e
d
iawiki (
t
9
3
63): test 'File:' i
m
por
t
an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
att
h
i
eu Moy
git-remote-mediawiki: support for uploading fil
e
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Simon Cathebras
git-remote-m
e
diawi
k
i (t93
6
2): test git-
r
emote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guill
a
ume Sasdy
git-
r
emote-mediawiki (t9361):
test g
i
t-remo
t
e-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
uillaume S
a
sdy
g
i
t
-rem
o
te-m
e
dia
w
iki
(
t
9
360): test gi
t
-re
m
ote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
gi
t
-re
m
ote-m
e
diawiki:
t
est environment of git-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
uil
l
aume Sasdy
git-remote-media
w
iki
:
scripts to install,
d
elete and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gar
y
Gibbons
git p4: refactor diffOpts calc
u
lation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next