repo.or.cz
/
git
/
mjg.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
Hama
n
o
M
er
g
e branch 'jn/ma
k
efile-cle
a
nup'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C H
a
man
o
Merge bra
n
ch 'ar/clone-honor-um
a
sk-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge branch
'
jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
a
n
o
Merge branch 'cw/rebase
-
i-
r
oot'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C
H
ama
n
o
Mer
g
e
b
ranch 'pw/gi
t
-p4-m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
J
u
n
i
o
C Ham
a
no
Merge branch 'pw/gi
t
-p
4
-j
o
bs'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C
H
amano
Merge
branch 'jk/pus
h
-delete-ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
S
ixth batc
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-s
t
d
in'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C H
a
mano
Merge branch
'
tg/
c
e-n
a
m
e
len'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Haman
o
Merge branch 'tb/sanitiz
e
-decomposed-utf-
8
-pathname
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
mano
Merge branch 'mm/mediawiki-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Haman
o
Merge br
a
n
c
h
'jn/
v
cs-svn
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ha
m
ano
Merge bran
c
h 'mm/mediawiki
-
fi
l
e-attachments'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge branch
'
tr/main
t
-s
h
ow-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e branch '
m
z
/rebase-n
o
-m
b
o
x'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
git p4: a
d
d support
f
or
'
p
4 mo
v
e' in P4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Re
d
uce draft release note
s
t
o
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Ha
m
ano
S
ync with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
unio C H
a
m
a
no
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/
m
a
i
nt-blame-unique-abbr
e
v'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branch 'rj/pla
t
f
o
rm-pread
-
may-be-thread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
M
er
g
e bran
c
h 'th/diff
-
no-index
-
fi
x
es'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
H
amano
Merge branch '
n
d
/c
l
o
n
e-s
i
ngle-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merg
e
branch
'
jc/rev-list-simplify-mer
g
es-
f
ir
s
t-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hama
n
o
Merge
br
a
nch 'hv/submodule
-
update-n
u
k
e
-su
b
modules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Haman
o
Merge branch 'jk/diff-
n
o-ind
e
x
-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'
m
m
/verify-filename
-
f
ix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge br
a
nch 'cn/cherry-pick-ran
g
e-doc
s
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hama
n
o
Merge b
r
anch 'jc/us
t
ar-che
c
k
s
um-is-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Ha
m
ano
M
e
rge
bran
c
h 'jc
/
bundle
-
complete
-
notice' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
a
no
Merg
e
bran
c
h
'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C
H
amano
M
erge br
a
nch 'jc/request-pull-match-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-10
Junio C Ha
m
a
no
a
pply: tests for the --
3
way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
a
d
d: crea
t
e
A
DD_EDIT
.
patc
h
w
i
th mo
d
e 0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
rerere:
m
ake
r
r-cache fanout
d
ire
c
tory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
app
l
y
: document --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
ply: allow rerere() to work on -
-
3
way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply: register conf
l
icted stages
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way with add/
a
dd
c
o
nflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
l
y
:
move verify_ind
e
x
_
match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: pl
u
g th
e
three-way merge logic i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: fall back on
t
hree-
w
ay
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
m
a
no
apply: accept -
3
/--3way command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Ha
m
a
n
o
apply:
move
"already exists"
l
ogic to check_to_creat
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: move c
h
eck_to_cr
e
ate
_
bl
o
b()
closer to
i
ts sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
am
a
no
apply:
furth
e
r split
l
oad
_
preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y
: refactor "
p
r
e
vious patch" lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: split
l
o
ad_preimage(
)
helper functi
o
n out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: factor out check
o
ut_target() helper func
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply: refactor
r
ead_fil
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: cle
a
r_image() c
l
ears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: a bit more co
m
men
t
s on
P
ATH_TO_BE_DELET
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
appl
y
:
fix a
n
incomplete commen
t
in check_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riesen
Rest
o
re umasks
influence
on the permission
s
of wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
M
e
rge git://gi
t
hub
.
com/git
-
l1
0
n/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
J
u
nio
C
Hamano
Merge
b
ranch '
c
w/help-over
-
network'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
Merge bran
c
h 'mz/empty-reb
a
se-test'
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C Ham
a
no
Merge branch 'pw/g
i
t
-
p
4-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
Merge bran
c
h 'js
/
fast-
e
xpo
r
t-paths-with-spa
c
es'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
M
e
rge branch 'cw/no
-
d
etach
i
ng-a
n
-unborn'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
Merg
e
branch '
v
r/use-our-perl-i
n
-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mm/credential-
p
l
u
mbin
g
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge branch
'
j
c/
m
a
int-blame-un
i
que
-
abbrev
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
a
mano
Merge branch 'jn
/
perl
-
makemaker
-
leadi
n
g-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'rj/
p
latfor
m
-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
a
n
ch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jona
t
han Nieder
M
akefile: do
c
ument ground
ru
l
es for target-specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefil
e
:
move GIT
-
VERSION
-
FILE dep
e
ndencies close
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile
:
build insta
w
eb si
m
ilar to other sc
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Kin
g
Mak
e
file: update
s
cript
s
when build-tim
e
p
a
rameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makef
i
le
:
do not replace
@
@
G
IT_VERSION@@ in shell s
c
r
i
pts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
King
Makefile:
split
pr
e
f
ix fla
g
s
fro
m
GIT-CFLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
onathan Nieder
Makefi
l
e: be silent when
o
nl
y
GIT_US
E
R_AGEN
T
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
Makefile: split GIT_USER_A
G
ENT
from
GI
T
-C
F
L
A
G
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f
King
Makefil
e
: do not repl
a
c
e @@G
I
T_USER_AGEN
T
@@
i
n sc
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
Makefil
e
:
apply dependencies consist
e
ntl
y
to sparse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
eff
K
ing
Makefile:
d
o no
t
have g
i
t
.
o depend on common-cmds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefile: fold XDIFF
_
H and VCSSV
N
_H in
t
o
LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Torsten Bög
e
rshausen
git on Mac OS
a
nd pre
c
omposed unicode
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
u
mmerer
Re
p
lace str
l
en() with c
e
_n
a
melen()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-remote-medi
a
w
i
ki: up
d
ate comments to ref
l
ect credential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Mo
y
g
i
t-re
m
o
t
e-m
e
diawiki: be more d
e
fe
n
si
v
e
when requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
gi
t
-remote-mediawiki
:
more ef
f
icient
'
p
ull' in
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-
m
ed
i
awiki: e
x
tr
a
c
t
r
evision-importing
l
oop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
thieu Moy
git-remot
e
-mediawiki:
r
efactor loop over re
v
is
i
on ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
att
h
ieu Mo
y
git-
r
e
mot
e
-med
i
a
w
iki:
change r
e
tu
r
n typ
e
of get_mw
_
pag
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN
Kim Thuat
git-remote-
m
edi
a
wiki (t9363)
:
test 'Fil
e
:
' impor
t
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
eu Moy
git-remote-mediawiki:
s
upp
o
rt for uploading file
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Simon
C
a
thebr
a
s
gi
t
-r
e
m
ote-medi
a
wiki (t9362): test git-rem
o
te-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
ll
a
u
me Sasdy
git-remo
t
e-mediawiki
(
t9361): te
s
t git-rem
o
te-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guill
a
um
e
Sas
d
y
git-remote-media
w
iki
(
t9360): test git-r
e
m
ote-medi
a
wiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
G
u
illaume Sasdy
git-remote-me
d
iaw
i
ki: t
e
s
t envi
r
onmen
t
of
g
it-r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaum
e
S
a
sdy
g
it-remot
e
-me
d
i
a
w
i
ki: scripts
t
o
i
nstall, d
e
lete and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gibbon
s
git
p4:
r
efactor
diffOp
t
s
c
a
l
culation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyc
k
o
f
f
g
it p4: notice Jobs lines in gi
t
commit
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git
p
4 test:
r
efactor marshal_d
u
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git p4: remov
e
u
n
u
sed
P4Sub
m
it
interactive setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Michael J
G
ru
b
e
r
t
3
404: m
a
ke test
57 wor
k
with dash and others
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next