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
Ham
a
no
Me
r
ge bra
n
ch
'
jk/i
n
dex-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Me
r
ge bran
c
h 'jk/maint-comm
i
t-amend-
o
nly-no-path
s
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
M
erge
b
r
anch 'cw
/
amend-commit-
w
ithout-messa
g
e'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Me
r
ge b
r
anch 'jn
/
mak
e
file-c
l
eanup'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
H
amano
Merge br
a
nc
h
'ar/clone-
h
o
nor-um
a
s
k-at
-
top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge branch
'
j
c/apply-3way
'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hama
n
o
Merge branch 'cw/rebase-
i
-ro
o
t'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
M
e
r
ge branch
'
pw/gi
t
-p4-
m
o
v
e
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o C Hamano
Merge
b
r
a
nch 'p
w
/
git-p4
-
jobs'
commit
|
commitdiff
|
tree
2012-07-14
Juni
o
C Ham
a
no
Me
r
ge branch 'jk/push-delete
-
ref-error-m
e
ssage
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
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 Hamano
Me
r
ge br
a
nch 'jc/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Ham
a
no
Merge
b
ranch 'tg/
c
e
-
n
amelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
n
o
M
e
rge
b
ranch
'
tb/sanitize-decomposed
-
utf-8-pat
h
name'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
M
e
r
ge branc
h
'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Merge
b
ranch 'jn/v
c
s-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge branch 'mm/mediawiki-file-
a
ttachments'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Ha
m
ano
Mer
g
e br
a
n
c
h
'
tr/maint-
s
how-walk'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hamano
Mer
g
e bran
c
h
'
m
z/reb
a
se-no-mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gar
y
Gibbons
gi
t
p4: ad
d
s
upport for 'p4 m
o
ve' in P4Submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Reduce draft release
notes t
o
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Sync wi
t
h 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
a
m
ano
Git
1
.
7
.
1
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/mai
n
t-b
l
ame-u
n
ique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge b
r
anch
'r
j
/pla
t
form-p
r
e
a
d-may-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
Hamano
Merge branch
'
th/dif
f
-no-index-fixes
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C
H
amano
Merge branch 'nd/clo
n
e-single-
f
ix' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ha
m
a
no
Me
r
g
e
b
r
anch
'jc/rev-
l
i
s
t-simpli
f
y
-
merges-fi
r
st-paren
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch '
h
v/submodule-upda
t
e
-nuke
-
submod
u
l
es'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merge branch 'jk/diff-no-index-pager' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
aman
o
Merge branch
'mm/verify
-
filename
-
fix' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C
Hamano
Merge bra
n
ch 'cn/ch
e
r
ry-pi
c
k-ran
g
e-docs
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'jc/ust
a
r
-checksum-is-unsigned' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Ham
a
no
Merge b
r
anch 'jc/
b
undl
e
-
complete-notice'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge br
a
nch '
j
c
/
l
s-
f
iles
-
i
-
dir' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Me
r
ge b
r
anch
'
jc/request-pull
-
mat
c
h-ta
g
name'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
index-
p
ack: loop
while in
f
l
a
ting ob
j
ects
in unpack_data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
com
m
it: fix "--amend --only"
wi
t
h no
pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C Hamano
appl
y
:
tests fo
r
the --3way o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
a
dd: create
ADD_EDI
T
.
patch with
m
ode
0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rer
e
re: make
r
r-cache fano
u
t
d
irectory honor
u
mas
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: doc
u
m
ent --3
w
a
y
o
p
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
apply: a
l
low r
e
rere() to work
o
n --3w
a
y
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
apply: regis
t
er
conflic
t
ed stage
s
to the in
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
ano
app
l
y: --3way w
i
th add
/
a
d
d conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: move veri
f
y_index
_
matc
h
()
higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug the three-way merge logic
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: f
a
ll
back
on three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
pply
:
accept -3/--
3
way command line opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
apply:
m
ove "alrea
d
y ex
i
sts"
l
ogic
t
o
c
heck
_
to_c
r
eate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
no
apply: move check_
t
o
_
create_blob() c
l
oser to
i
t
s sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
a
p
p
ly: further split load_
p
re
i
mage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refa
c
tor "prev
i
ous
patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split l
o
ad_preimage() hel
p
e
r fun
c
tion 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
_
t
arget()
h
elper f
u
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: refac
t
or read_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: clear_image() clears
t
hings a bit mor
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply: a bit more comment
s
on
P
ATH_T
O
_BE
_
DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
ap
p
ly
:
f
ix an
inco
m
plete
comment i
n
check_patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Alex R
i
e
sen
Res
t
o
r
e
umasks
influe
n
ce on th
e
perm
i
ssions of w
o
rk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ch
r
is Webb
Allow edit o
f
em
p
ty messa
g
e with commit --
a
m
en
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
M
e
rge
g
it://
g
ithub
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
aman
o
Fifth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C
H
amano
Merge branch 'cw/
h
elp-over-network
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch
'mz/em
p
ty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hama
n
o
M
e
r
ge branch 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
Merge branch 'j
s
/fast-export-paths-
w
ith-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Mer
g
e
branch 'cw/no-de
t
aching-an-u
n
bor
n
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge bran
c
h
'vr/u
s
e-o
u
r-perl-
i
n-tes
t
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge
b
ran
c
h 'mm/credential-plum
b
i
n
g
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch 'jc/maint-bl
a
me-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Haman
o
Merge branch
'
jn/per
l
-makema
k
er-leading-
p
at
h
s
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
M
erge branch 'rj/platform-pread
-
may
-
be
-
thread-unsafe
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hama
n
o
Merge
b
ranch 'm
m
/
c
onf
i
g-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n Niede
r
Makefile: document
ground rules for target-speci
f
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
ng
M
ak
e
file: mov
e
GIT-VERSION-FILE
d
ependencie
s
closer
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff
K
i
ng
Makefi
l
e: bui
l
d instawe
b
similar to other sc
r
ipts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
kefi
l
e
:
u
pdate scripts when b
u
ild-time parameters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
Makef
i
l
e: do not replace
@
@GIT_VERSION@@ in shell sc
r
ipts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff Ki
n
g
Ma
k
efi
l
e: spl
i
t prefix flags fro
m
GIT-CFLAG
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefile: be
s
ilent
w
hen o
n
ly GIT_USER_AGENT changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
ng
Makefi
l
e
: s
p
li
t
GI
T
_USER
_
AGENT from GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
Makefile
:
do not replace @@
G
IT_USER_AGE
N
T
@
@ in script
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefi
l
e: apply depen
d
e
n
c
ies co
n
sisten
t
ly to spars
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Makefile: do not ha
v
e git
.
o depend on common
-
cmds
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n
N
ieder
Makefile: fold XDIFF_H and VCSSVN
_
H into LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
T
orste
n
Bögershausen
git on Mac OS and precomposed unico
d
e
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Thomas Gummer
e
r
Replace str
l
en()
w
it
h
ce_na
m
elen(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Matth
i
eu Moy
git-r
e
m
o
t
e
-media
w
ik
i
:
u
pdate comm
e
nts to reflect
c
r
edential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tthieu
Moy
gi
t
-remote-
m
ediawiki: be
m
ore defensive when re
q
uests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
M
o
y
g
it-remote-medi
a
wiki: more efficient 'pull' in th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
e
u Moy
gi
t
-
r
emote-mediawiki: extract r
e
vision-impo
r
t
i
ng loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Mo
y
g
i
t-remote-mediawiki: refactor l
o
op over re
v
ision i
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Mo
y
g
i
t
-
r
emot
e
-
m
e
dia
w
ik
i
: change re
t
urn
t
ype of
g
e
t_mw
_
pag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
N
G
UYEN Kim Th
u
a
t
git-remote-mediaw
i
ki (t9
3
63)
:
test 'F
i
le:'
import and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
eu Moy
gi
t
-
r
emo
t
e-medi
a
wiki: sup
p
ort for
uplo
a
ding file in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Simon Cathe
b
r
a
s
git-remote-mediawi
k
i (t9362): test git-remo
t
e-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-remot
e
-mediawiki (t9
3
6
1
)
:
t
est git
-
rem
o
te-medi
a
wiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-r
e
mote-mediawiki (t9360): test gi
t
-remote-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
uillaume Sasdy
git-remote-mediawiki: test environmen
t
o
f
git-rem
o
te
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next