repo.or.cz
/
git
/
jrn.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
J
u
nio C
H
ama
n
o
Mer
g
e branch 'jn/m
a
kef
i
le
-
cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bra
n
ch
'
a
r/
c
lone-
h
onor-umas
k
-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e b
r
anch 'jc/apply-
3
w
a
y'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Merge
b
r
a
nch '
c
w
/rebase
-
i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'
pw
/
git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hamano
Merge branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C H
a
man
o
Merge
b
ranch
'
jk/pu
s
h-delete-ref-erro
r
-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
S
ixth
b
atch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C
Hamano
Merge bran
c
h 'jc/re
f
act
o
r-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
M
e
rge branch '
t
g/
c
e-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C
H
amano
M
erg
e
branch
'
tb/s
a
nitize-de
c
omposed
-
utf-8-p
a
thna
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
an
o
Merge b
r
anch
'
mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Merge
branch
'
jn/vc
s
-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Merge
bra
n
ch 'mm/med
i
awiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Merge
b
ranch 'tr/main
t
-show-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
M
erg
e
bra
n
ch 'mz/rebase-no-m
b
o
x
'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
git p4: add support for 'p4
m
ove'
i
n P4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Reduce
d
r
a
ft
r
elease 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
ync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
am
a
no
Merge branch
'
jc/maint-blame-unique-abbre
v
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Hamano
M
e
rge bra
n
ch 'rj/platform
-
pre
a
d-ma
y
-be-thread-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'th/d
i
ff-no-index-fi
x
es' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
amano
M
erge branch
'nd/cl
o
n
e
-sin
g
le-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merge branch 'jc/re
v
-list-simp
l
ify-merges
-
firs
t
-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge br
a
nch 'h
v
/submodule-upd
a
te-
n
uk
e
-
sub
m
odules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge bra
n
ch 'jk/diff-n
o
-index-
p
ager' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hama
n
o
M
e
r
ge branch 'mm
/
veri
f
y-f
i
lenam
e
-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'cn/ch
e
rry-pick-range-do
c
s' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C Hama
n
o
M
e
rg
e
branc
h
'jc/
u
sta
r
-check
s
um-is-unsigned' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
M
e
rg
e
b
r
anch 'jc/bundle-complete-notice' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch
'
jc/l
s
-files-i-dir' into
m
ai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch 'jc/
r
e
q
uest-pull-match-ta
g
nam
e
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: t
e
sts for the --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Je
f
f
King
add:
c
reat
e
ADD_EDIT
.
patch
with mode 066
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
rerere: ma
k
e rr-cache fa
n
out directory honor umas
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
app
l
y:
d
o
c
ument
--3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
apply
:
allow rerere() to
wor
k
on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
appl
y
:
register conflict
e
d stages to the
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
apply: --
3
way
with add/add
c
o
nflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
a
pp
l
y: mo
v
e verify_inde
x
_ma
t
ch() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: p
l
ug
t
he three-w
a
y
merge
logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
appl
y
:
fall
b
a
c
k on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
p
ly:
accept -
3
/--3
w
ay c
o
mma
n
d lin
e
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
a
pply: move "already exists" l
o
gic to c
h
e
ck
_
to_cre
a
te
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
apply
:
move ch
e
c
k_to_
c
reate_blob() closer to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
app
l
y: f
u
rther split
load_p
r
eimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: r
e
facto
r
"
prev
i
ous patc
h
" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply:
s
plit load_prei
m
age() he
l
per function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply
:
factor out checkou
t
_
target()
he
l
per function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
r
efactor
r
ead
_
fi
l
e
_
o
r
_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
pply:
c
lear_image() clears things a bit
m
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: a bit m
o
re comments on
PATH
_
T
O_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
a
pp
l
y
: fix an
i
ncomplete comment in check_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ale
x
R
i
esen
Restor
e
u
m
asks influen
c
e
on th
e
per
m
issions of work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge git
:
//github
.
com/git-l10n/g
i
t
-
p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Fifth ba
t
ch fo
r
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
Merge bra
n
ch
'
c
w/
h
elp-over-network'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
Merge branch 'mz
/
em
p
ty-rebase-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
Mer
g
e branch
'pw/git-p4
-
tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge branch 'js/fast-
e
xport-path
s
-with-space
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/no-detaching-an
-
u
nborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bran
c
h 'vr/use-our-
p
erl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Mer
g
e branch 'mm/credential-plumbi
n
g'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge branch 'jc/maint
-
blam
e
-unique-abb
r
ev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch
'
jn/perl
-
makemaker-
l
eading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
Mer
g
e branch 'rj/platform-pread-may
-
be-thre
a
d-unsa
f
e'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch 'mm/con
f
i
g
-xd
g
'
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n N
i
eder
Ma
k
efile: doc
u
m
ent gr
o
und rules fo
r
target
-
spec
i
fic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Makefi
l
e: move GIT
-
VERSION-FIL
E
dependencie
s
clos
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Makefil
e
: build
i
nstaweb similar
t
o other scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: upd
a
te scripts when build
-
time p
a
r
ameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile:
do
n
ot re
p
lace @@GIT_VE
R
SIO
N
@@ in shell scri
p
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
Makefile: split prefi
x
flag
s
f
r
om GIT
-
CFLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Niede
r
Ma
k
efi
l
e: be silent when
o
nly GIT_USER_AGENT
c
hanges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
M
akefile:
spli
t
GIT
_
USER_AGENT from GIT-CFLAG
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
M
a
k
efile: do no
t
repla
c
e @@
G
IT_U
S
ER_AGENT@@ in scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
M
a
kefil
e
:
a
p
p
ly
depend
e
ncies co
n
sistently to sparse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f King
Mak
e
f
ile: do
n
ot
have git
.
o
d
epend on common-
c
mds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonat
h
an Nieder
Makefile: fold
X
DIFF_H and
VCSSVN_H
into LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
T
o
rsten 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
homa
s
Gum
m
e
r
er
Replace s
t
rlen()
wi
t
h
c
e_n
a
melen()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
M
at
t
hi
e
u Moy
gi
t
-remote
-
medi
a
wiki
:
update com
m
en
t
s
to
reflec
t
cred
e
ntial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
g
i
t-rem
o
te-mediawiki: be more defe
n
s
ive when requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
atthieu Moy
git-
r
emote-mediawiki: more ef
f
icient
'
pull' in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
e
u M
o
y
git-
r
emote-med
i
awiki: extract
r
e
vision-importing loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tthi
e
u Moy
git-re
m
ote-mediaw
i
ki
:
refactor
l
oop over revis
i
on ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remot
e
-me
d
i
a
wiki: cha
n
ge return type of get_mw_pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN Kim Thuat
git-re
m
ot
e
-m
e
diawiki
(
t9
3
6
3
): test 'File:' import and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Mo
y
git-remote
-
mediawiki: support for
u
ploading file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Simon Cathebras
git-remot
e
-
m
ediawiki (t93
6
2): t
e
st
g
it-re
m
o
t
e-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-r
e
m
o
te-mediawiki (t9361): test git-
r
emote-mediawik
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
g
i
t-r
e
m
ot
e
-mediawiki (t9360): te
s
t git
-
remote-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillau
m
e
S
asdy
git-remote
-
m
ediawiki: test environment of git-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
llau
m
e Sasdy
git-r
e
mote-me
d
i
a
wiki: scripts t
o
i
n
stall, de
l
ete and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gi
b
bon
s
git p4: refactor
d
iffOpts calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pe
t
e Wy
c
koff
git p4: notice Jobs lines in
g
it
com
m
it mes
s
a
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git p4 test: re
f
actor marshal_dum
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git p4: remove
u
nused P
4
Su
b
mit interactive setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Michael
J Gruber
t3404
:
make test 57 work with dash a
n
d others
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next