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
Update draft release notes for 7th batch
2012-07-16
Junio C Hamano
Update dr
a
ft
r
elea
s
e notes for 7th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Mer
g
e bra
n
ch 'tg/maint-
c
ache-name
-
compare'
commit
|
commitdiff
|
tree
2012-07-16
J
unio
C Hamano
Merge branch
'jk/index-
p
ack-stre
a
ming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
Hama
n
o
M
erge br
a
nch 'jk/maint-commit-amend-only-no
-
paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Me
r
ge
br
a
nc
h
'cw/
a
mend
-
com
m
it-wi
t
ho
u
t-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
M
erge branch 'jn/
m
a
k
efile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
J
uni
o
C Hamano
Merge branch 'ar/clo
n
e-h
o
nor-
u
mask
-
a
t
-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Ham
a
n
o
M
erge b
r
a
nch 'j
c
/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C Hamano
Merge
b
ranch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Ham
a
n
o
Merge bran
c
h 'pw/git-p4-m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hamano
Me
r
g
e
b
r
anch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
H
amano
Me
r
g
e branch 'jk/push-dele
t
e-ref-e
r
ro
r
-me
s
sage
'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C
Ha
m
ano
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merg
e
b
ranc
h
'
jc/refactor-diff-st
d
in'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Hamano
Me
r
g
e
b
ran
c
h
'tg/ce-
n
amele
n
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C H
a
mano
M
e
rge branch '
t
b/sani
t
ize-decomposed-
u
tf-
8
-pathn
a
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
Mer
g
e
branch
'
m
m
/
medi
a
wi
k
i-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
branch 'jn/vcs-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge branch 'mm/med
i
awik
i
-
f
i
l
e
-attachme
n
ts'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merg
e
branch 'tr
/
m
aint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hamano
Merge branch 'mz/rebase
-
no-mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbo
n
s
git p4:
ad
d
sup
p
ort for '
p
4
m
ove'
i
n P4Submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Redu
c
e draf
t
release notes to 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
aman
o
S
ync with 1
.
7
.
1
1
.
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
J
unio
C Hamano
Merge
bran
c
h 'jc/maint-b
l
ame-unique-abbrev' in
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Hamano
Merge
b
ranch 'rj/platform-pre
a
d-ma
y
-be-t
h
read-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
Merge br
a
nch 'th/diff-no-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
Hamano
Merge branch 'nd/clone-sin
g
le-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
Merge branch 'jc/rev-li
s
t
-simplify-m
e
rges-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Haman
o
Merge bran
c
h '
h
v/submodu
l
e-update-nuke-submodu
l
e
s'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
Hamano
Mer
g
e branch 'jk/diff-
n
o-inde
x
-
p
ag
e
r
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
Merg
e
b
r
a
nch 'mm/
v
erify-file
n
am
e
-
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
Ham
a
no
Me
r
ge b
r
anc
h
'cn/
c
herry-pick
-
range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Hamano
M
e
rge b
r
anch
'
jc/u
s
t
a
r-
c
hecksum-is-unsigned' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
man
o
Me
r
ge
b
r
a
nch 'jc/bundle-com
p
lete-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branc
h
'
j
c/ls-files-i-dir' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge
branch 'jc/request-pull-ma
t
ch
-
tagname' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
c
a
che_name_co
m
pare(): do not
trun
c
at
e
w
h
i
l
e comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
i
n
dex-
p
a
c
k
: loop w
h
ile i
n
flating o
b
ject
s
in un
p
ack_da
t
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff Kin
g
comm
i
t:
fix "--am
e
nd --only" with no path
s
p
ec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o C Hamano
a
p
ply:
t
ests for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff K
i
ng
add: create AD
D
_EDIT
.
pat
c
h
w
it
h
mode 0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
rerere: make rr-cache fanou
t
directory honor u
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
y: document
--3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: a
l
low rerere()
to work on --3wa
y
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
apply: registe
r
conf
l
ic
t
ed stage
s
to t
h
e in
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
ply: -
-
3way
w
ith a
d
d/add conf
l
ict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: move verify_i
n
dex_match()
higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Ha
m
ano
a
p
p
l
y
:
p
l
ug the t
h
r
ee-way merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: fall back
o
n three
-
way
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
apply: acce
p
t -3/-
-
3
w
ay comm
a
nd
l
i
ne opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: m
o
ve "alr
e
ady exists
"
l
ogic to
check_
t
o
_
c
r
e
ate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: mo
v
e check_to_create_blob() cl
o
ser to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
apply: furth
e
r split load_preimage(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
apply: r
e
factor "previous pat
c
h"
l
og
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
apply: split load_preimage() helper funct
i
on o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
apply: factor out ch
e
ckout_t
a
rget() he
l
per functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
refactor read_fil
e
_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
appl
y
: c
l
ear_image()
clears t
h
ings a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
a bit more co
m
m
ents on
P
ATH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
app
l
y:
fix
a
n incompl
e
te comment
in check_patc
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riesen
Rest
o
re umasks influence on
t
he permissions of w
o
rk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Chris
W
e
bb
A
l
low edit of empty message w
i
th commit -
-
amend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
g
e
g
it://githu
b
.
com/
g
it-l10n/git
-
po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
F
ifth
b
atch f
o
r 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Ha
m
ano
Merge
branch 'cw
/
he
l
p-o
v
er-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge branch 'mz/e
m
pty-
r
eba
s
e-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
an
c
h 'p
w
/git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'j
s
/fast
-
export-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge br
a
nch 'c
w
/no-detach
i
ng-
a
n-unborn
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge
b
ranc
h
'vr/use-ou
r
-
p
erl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Haman
o
Merge branc
h
'mm/credential-
p
lumbing'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Me
r
ge branc
h
'jc/maint-
b
lame-unique
-
abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
M
erge
branch 'jn/
p
e
r
l
-
m
a
k
emake
r
-leadin
g
-
p
a
t
hs'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch 'rj/pla
t
f
orm-prea
d
-may-be-
t
hre
a
d-uns
a
fe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch
'
m
m
/conf
i
g
-
xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jo
n
at
h
an Nieder
Makefile: d
o
cumen
t
ground rules
f
or target-spec
i
fic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Make
f
ile
:
move GIT-VERSION
-
FILE dependenc
i
es
c
loser
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefil
e
:
build instaweb si
m
ilar to other
scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
Mak
e
file: update sc
r
ipts 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
ef
i
le:
do not replace @@G
I
T_VERSION@@ in shell sc
r
i
pt
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f King
Makefile:
s
plit
prefix flags
from GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makef
i
le: be silent
whe
n
only
GI
T
_USER_AG
E
NT changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
ing
M
a
k
e
f
i
le: split GI
T
_
U
SER_AGENT from GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff K
i
ng
Makefile: do not repla
c
e @@G
I
T_USER
_
AGENT@@ in sc
r
ipts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Ma
k
efile: apply dependenci
e
s
consis
t
ently
t
o
sparse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
K
in
g
Ma
k
efile: do no
t
h
ave git
.
o depend
o
n com
m
on-
c
m
d
s
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan
N
iede
r
Makefil
e
: fold X
D
IFF_H and VCSSVN_H into L
I
B_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
To
r
s
te
n
Bögershausen
git on
Mac OS and preco
m
posed 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
hom
a
s
Gummerer
Replac
e
str
l
en() with c
e
_na
m
elen
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
M
a
tthieu Moy
git-rem
o
te-mediaw
i
ki: update commen
t
s to reflect
cred
e
ntial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Moy
git-remote-mediawiki: be
m
ore defensive when requests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
M
oy
g
i
t
-
rem
o
te-mediaw
i
k
i
: more efficient 'pull' in th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
g
i
t-
r
emote-mediawiki: extract
r
e
vision-importing loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Moy
git-remot
e
-mediawik
i
: refactor loop over
revi
s
ion ids
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tt
h
ie
u
Moy
git-remote-mediawiki
:
change retur
n
type of ge
t
_mw_pa
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NG
U
Y
E
N
K
im Thuat
git-r
e
mo
t
e-mediawiki
(t
9
363): test 'File:' import
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Mo
y
git-remot
e
-mediawi
k
i: s
u
pport for up
l
oading
f
i
le in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
S
i
mo
n
Catheb
r
a
s
git-remote-mediawiki (t9362): test g
i
t
-r
e
mo
t
e
-
me
d
iawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next