repo.or.cz
/
git
/
gitweb.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/index-pack-streaming-fix'
2012-07-16
Junio C Hamano
Merge
branch 'jk/index-p
a
ck-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
M
erge branch 'jk
/
m
aint-commit
-
ame
n
d-only-
n
o-paths'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C
Haman
o
Merge branch 'cw/amend-commit-wi
t
hout-m
e
ssage'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merge branch 'jn/make
f
ile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io
C Hama
n
o
Me
r
g
e bra
n
ch 'ar
/
c
l
one-honor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
M
erge b
r
anch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io
C Hamano
Merge branch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
erge
b
ranch 'p
w
/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hamano
Merge branch '
j
k/push-
d
elete-ref-error-me
s
sage'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C Hamano
Six
t
h
batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
M
e
r
g
e b
r
anch 'j
c
/refactor-diff
-
s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hamano
Me
r
ge b
r
anch '
t
g/
c
e-nam
e
len'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
branch 'tb/
s
a
n
itize-d
e
composed-utf-8
-
pathn
a
me'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C Hamano
Merge branch
'mm/m
e
diawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge branch 'jn/
v
c
s-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
a
mano
Merge branc
h
'm
m
/mediawiki-file
-
attach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bra
n
ch
'
t
r/maint-sho
w
-wa
l
k'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branch 'mz/reba
s
e-n
o
-mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibb
o
n
s
g
it p4: add support for 'p4 move' in P4Submit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Reduce dra
f
t release note
s
to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sy
n
c w
i
th 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Git
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ha
m
an
o
Merg
e
branch 'jc/maint-blame-
u
niq
u
e-abbrev' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ha
m
a
n
o
Merge branch 'rj
/
platform-p
r
ead
-
may-b
e
-thread-unsa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Hamano
M
e
r
ge branch '
t
h
/diff-no
-
index-fi
x
es'
into
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch
'nd/
c
lone-single
-
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge br
a
nch 'jc/rev-list-s
i
mplif
y
-merges-fir
s
t
-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Hamano
Merge
b
ranch 'hv
/
submod
u
le-updat
e
-nuke-subm
o
dules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
Merge branch
'
jk/diff-n
o
-inde
x
-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
Merge bran
c
h 'mm/verif
y
-filename-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'cn/cherry-pick-range-d
o
c
s
' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Haman
o
Merg
e
branc
h
'jc/
u
star-che
c
k
sum
-
is-unsigned' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge b
r
anch '
j
c
/
bun
d
le-co
m
plete-noti
c
e'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ha
m
ano
Merge branch 'jc
/
ls-fi
l
es-i-dir
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
man
o
Merge branch 'jc/request-
p
ull-match-tagn
a
me' into
m
aint
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
index-pa
c
k: lo
o
p whi
l
e
i
nflating
o
b
jects
in unpa
c
k
_d
a
ta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff K
i
ng
commit: fix "--amen
d
--only" with no pat
h
sp
e
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
u
n
io C Ha
m
ano
appl
y
: tests for
t
he --3way
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff
K
ing
add: creat
e
ADD_EDIT
.
p
atch with mode
0
666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: make rr-cache fanout direct
o
ry honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
a
ppl
y
: document -
-
3way opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: allow rerere() to work
on --3way resu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
a
no
a
pply: register
conflicted st
a
ges to the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
apply: --3way
with add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
p
pl
y
: move
v
e
r
ify_index_match() highe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
pl
u
g the th
r
ee-way merge logic 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
r
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: accept -3/--3
w
ay command line opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply: move "already
exists"
logic to check
_
to
_
create(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
ppl
y
: move ch
e
ck_to_create_
b
lob() clo
s
er to its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: further split
lo
a
d_preim
a
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly
:
refactor
"previous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_preimage() helper functio
n
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y: factor out checkout_target() helper func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: refactor read_fi
l
e
_
o
r
_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: clear_image()
c
lears
things a b
i
t more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
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
Juni
o
C H
a
m
ano
ap
p
ly: fi
x
an incomplete comment
i
n check_p
a
tch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riese
n
Restore umask
s
infl
u
ence on
t
h
e
pe
r
missions o
f
wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Allow
ed
i
t of
e
mp
t
y message with
c
om
m
i
t
--amend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
Merge git://github
.
com/g
i
t
-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Fifth ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
Merg
e
b
r
a
nch 'cw
/
help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge branch 'mz/em
p
ty-
r
eb
a
se
-
test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge bran
c
h 'pw/git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge branch 'j
s
/fas
t
-export
-
paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
Merg
e
branch 'cw/no-de
t
aching-an-un
b
orn'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Haman
o
M
erge b
r
anch 'vr/u
s
e-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merge b
r
anch 'mm/credenti
a
l
-
p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rg
e
b
r
anch 'jc/maint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
aman
o
Merg
e
branc
h
'jn/p
e
rl-mak
e
make
r
-leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge b
r
anch '
r
j
/
p
latfo
r
m-pread-may-be
-
t
hread-unsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
bra
n
ch
'mm/config-x
d
g'
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n Nie
d
er
M
a
kefile: document ground rules for
target-
s
pec
i
fi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
akefile:
m
o
ve GIT-VERSI
O
N-F
I
L
E
depe
n
dencies closer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
kefile: bui
l
d
instaw
e
b similar t
o
o
ther scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
n
g
Makefile: update scrip
t
s when
b
uild-ti
m
e
parameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f
King
Ma
k
e
fi
l
e:
do not
rep
l
ace @@GIT_VER
S
ION@@
i
n
shell script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: split prefix fla
g
s from GIT-CFLA
G
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefile: be silent when o
n
ly GIT
_
U
S
E
R
_
A
G
ENT changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
ng
Ma
k
efi
l
e: split GIT_US
E
R_AGENT from GIT-C
F
L
A
G
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
Makefil
e
:
do n
o
t replace @
@
GIT_USER_AG
E
N
T@@ in
s
c
ripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: apply
d
epe
n
denci
e
s
cons
i
stently to spa
r
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Makefile: do not hav
e
git
.
o depend on common-cmds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefile:
f
old XDIFF_H and VCS
S
VN
_
H int
o
LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Tors
t
en
Bög
e
rsh
a
usen
g
it
on M
a
c O
S
and precomp
o
sed 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
Gum
m
e
rer
Replace
strlen() with ce_na
m
elen(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu
M
o
y
g
i
t
-
remote-mediawiki: update comments to reflect credential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
g
it-re
m
ote-mediawiki: be mo
r
e defensive when requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matt
h
ieu
M
oy
git-remote-med
i
awiki:
m
o
r
e efficient 'pull' in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
gi
t
-remote
-
m
edia
w
iki
:
e
xtract rev
i
sion-i
m
p
o
r
ting loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-re
m
ote-
m
ediawik
i
: re
f
a
ctor loop
o
ver revis
i
on
i
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Moy
git-remote-me
d
i
awiki: change return type o
f
g
et_mw_p
a
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUY
E
N Kim Thua
t
git-remote-mediawiki (t936
3
): test
'
File:
'
imp
o
r
t
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tthieu Moy
git-r
e
mote-m
e
dia
w
ik
i
: support for uploading file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
S
imon
C
athebra
s
git-r
e
mot
e
-mediawiki (t9362):
t
est git-remote
-
med
i
a
wiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
G
u
illaume Sasdy
git-remote-mediawiki (t9361):
test git-remot
e
-
mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillau
m
e Sas
d
y
g
i
t-re
m
ote-med
i
awiki (t9
3
60
)
: test gi
t
-
remo
t
e-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume
S
asdy
git-remote-medi
a
wiki: test enviro
n
ment of git-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next