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
H
a
m
ano
Merge branch
'
jn/
m
akefile-clean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
n
o
Merge branch 'ar/
c
l
o
ne-hon
o
r
-umask-at-
t
op'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
ano
M
er
g
e branch 'jc/
a
pply
-
3way'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Ham
a
no
Merge br
a
nc
h
'cw
/
rebase-i-ro
o
t
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hama
n
o
Merge br
a
nch 'p
w
/
g
i
t-p4-move
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
Ha
m
a
no
Merge branch 'p
w
/gi
t
-p4-jo
b
s'
commit
|
commitdiff
|
tree
2012-07-14
J
u
ni
o
C H
a
mano
Merge bran
c
h
'jk/push-d
e
lete-
r
ef-error-
m
essage'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
man
o
Sixt
h
b
a
tch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge branch 'j
c
/re
f
actor-diff
-
stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge b
r
anch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
amano
Merge br
a
nch
'
tb/sanitize
-
d
e
composed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
M
erge branch 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge b
r
an
c
h
'jn
/
v
cs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge branch 'mm/med
i
a
wiki-file-
a
ttachmen
t
s'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C
Hamano
Merge bran
c
h 'tr
/
maint
-
show-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge branch 'mz/rebase-no-mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
g
it p4:
a
dd sup
p
ort for 'p4
m
o
v
e' in P4
S
ubmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hama
n
o
Re
d
u
ce draft rele
a
s
e
n
o
t
e
s to
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Sy
n
c
w
i
t
h 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'jc/maint-
b
la
m
e-u
n
iq
u
e-abbrev' in
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
Merg
e
b
r
a
nc
h
'rj/plat
f
orm-pread
-
m
ay-be-thr
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 't
h
/diff-no-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
M
e
rge branch 'n
d
/
clon
e
-single
-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Ha
m
ano
Merge branch 'jc/
r
ev-list-simpl
i
fy-
m
erges-fi
r
st-
p
arent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'hv/submodul
e
-update
-
nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e b
r
anch '
j
k/diff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch 'mm/verify-fi
l
e
n
a
m
e-fix'
i
nto
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
Merge
b
r
a
n
ch 'cn/cherry-pick-range
-
docs' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merge branch 'jc
/
us
t
ar-ch
e
c
ksum-is
-
unsigned'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hamano
Merge
b
ranch 'jc/bundle-
c
omplete-notice
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch '
j
c/ls-f
i
les-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hama
n
o
M
e
rge branch 'jc/request-pull-
m
a
t
ch
-
tagname' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
amano
apply:
tests
fo
r
t
h
e --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jef
f
King
add:
c
reate ADD_EDIT
.
p
a
t
ch with mod
e
0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: make rr-cache fanout direc
t
ory
honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply: documen
t
--3way opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply: al
l
o
w rerere(
)
to work
on
--3way r
e
s
u
l
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: re
g
iste
r
con
f
li
c
ted stages t
o
the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
pl
y
: -
-
3way with add/add
conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: move verify
_
index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C H
a
mano
apply
:
plug the th
r
ee-way mer
g
e l
o
g
i
c in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: fal
l
back on thre
e
-w
a
y
mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C Hama
n
o
a
pply: accept -3/--3way co
m
mand line
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
pply: mo
v
e
"
a
l
ready
e
xists" logic to check_to_creat
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: move
c
heck_
t
o_create_blob() close
r
to it
s
s
ole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
app
l
y:
f
urther split load_prei
m
age()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: refactor "
p
revio
u
s patch"
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
ap
p
ly:
split load
_
p
re
i
m
a
ge()
h
elper
f
unction out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
ap
p
ly:
f
actor out chec
k
ou
t
_target() he
l
per funct
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ham
a
n
o
a
p
ply: refac
t
o
r
r
ead_file_or_git
l
in
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C Ham
a
no
a
ppl
y
: clear_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 Ham
a
no
a
p
ply: a bit more comments on PATH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
apply: fix an incomplete
c
omment in
check_
p
atc
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riesen
Restore umasks influenc
e
on the permissions
o
f wo
r
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
a
no
Merge gi
t
://git
h
u
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Fifth ba
t
ch 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
'c
w
/help-over-ne
t
work'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge
b
ran
c
h 'mz/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
Merge branch 'pw/git-p
4
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge bra
n
ch
'
js/
f
a
s
t-export
-
p
a
ths-with-
s
paces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
M
e
rge
b
ranch 'cw/no-detaching-an-unbor
n
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
M
e
rge bran
c
h 'vr/use
-
our-perl-in
-
t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
Merge bra
n
ch 'mm/credenti
a
l-pl
u
mbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merg
e
branch 'jc
/
m
a
int-blame-un
i
que-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ha
m
ano
Mer
g
e br
a
nch 'jn/p
e
r
l-makemaker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge bra
n
ch 'rj
/
platform-pread-may-be-t
h
read-un
s
a
f
e'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge branc
h
'mm/con
f
ig-xdg'
commit
|
commitdiff
|
tree
2012-07-09
J
o
nathan N
i
eder
Makefile:
d
o
c
umen
t
grou
n
d rules for ta
r
get-specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
King
Makefile: move GIT-VERS
I
ON-FILE dependen
c
ies closer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile:
build instawe
b
s
i
m
ilar
to oth
e
r scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Makefi
l
e:
update scripts when build
-
time param
e
ters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Ma
k
efil
e
: do not replace @@GIT_V
E
RSION@@ in s
h
ell scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Kin
g
Makef
i
le: sp
l
it prefix fla
g
s
from
GIT-CFL
A
GS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
on
a
than Nieder
Makefile:
be silen
t
when o
n
l
y
GIT
_
USER_AGENT changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Kin
g
Makefile: spli
t
GIT_USER_AG
E
NT from G
I
T-C
F
LAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: do
n
ot
r
eplace @@GIT_USER_AGENT@@ in scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Ma
k
efi
l
e: app
l
y de
p
endencies consistently to sparse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: do
n
o
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 Nied
e
r
Ma
k
efi
l
e: fol
d
X
D
IFF
_
H
and VCSSVN_H into LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
T
orsten Bögershausen
git on Mac
OS and
precomposed unicode
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
T
h
o
mas Gu
m
m
erer
R
e
pl
a
ce strlen() with ce_n
a
melen()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-remot
e
-med
i
awiki: update c
o
mmen
t
s to re
f
l
e
ct credent
i
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawiki: be more defe
n
siv
e
when reque
s
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
M
o
y
gi
t
-
remote
-
mediawik
i
: more e
f
f
i
cient
'pull' in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
att
h
ieu
M
oy
git-remo
t
e
-
media
w
iki:
extract revis
i
o
n
-importing loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
gi
t
-rem
o
te-med
i
a
wiki: refactor
l
oop over revision ids
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-med
i
awiki: change return type
o
f get_mw_pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN
K
im Thuat
g
it
-
remote-mediawiki (t9363
)
: test '
F
ile:' imp
o
rt and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
git-remote-medi
a
wiki: s
u
pport for upl
o
a
d
ing file in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Simon Ca
t
heb
r
as
git
-
r
e
mo
t
e
-
m
e
diaw
i
ki (
t
9362):
t
e
st git-rem
o
te-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume
Sasdy
g
i
t-re
m
ot
e
-m
e
d
iawiki (t9361
)
: test g
i
t-remote-mediawi
k
i
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillau
m
e
S
asdy
git-remote-mediawiki (t9360): t
e
st gi
t
-
remote-
m
ediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
llaume S
a
sdy
git-remote-mediaw
i
k
i:
test environment of git-
r
e
m
ote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume
S
asd
y
git-
r
emote
-
mediawiki: scripts to install, delete and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
a
ry Gibbons
git
p
4: refac
t
or diff
O
pts c
a
lculation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pet
e
W
yckoff
git p4: notice Jobs
l
ines in git commi
t
mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete
W
y
ckoff
g
it p4
t
est: refa
c
tor
m
arshal_
d
ump
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyck
o
ff
git p4: remo
v
e unused P4Submit interactive
s
etting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Micha
e
l J Gr
u
ber
t
3
404: make tes
t
57 w
o
rk with das
h
and
ot
h
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next