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/maint-commit-amend-only-no-paths'
2012-07-16
Junio C Hamano
M
e
r
ge branch 'jk/maint-commit-amend-only-no-path
s
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge branch
'cw/a
m
end-commit-withou
t
-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
br
a
nch 'jn/mak
e
fil
e
-cleanu
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
a
mano
Merge b
r
anch 'ar/clone-h
o
nor-uma
s
k-
a
t-to
p
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
am
a
no
Merge branch 'j
c
/appl
y
-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Haman
o
Merge branch
'c
w
/r
e
base-i-r
o
o
t
'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
Hamano
Merge bran
c
h
'pw/git-p4-m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C Hama
n
o
Merge
b
ranch 'pw/git-p4-j
o
bs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
e
rge bran
c
h 'jk/push-delete-ref-er
r
or-mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Sixth
b
a
t
ch
f
or
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge branch
'jc/refac
t
or-
d
iff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
man
o
Merge branch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o
C Hamano
M
erg
e
branch 'tb
/
saniti
z
e-decomposed-utf-8-pathn
a
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branc
h
'mm/
m
ediaw
i
k
i
-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Merg
e
branch 'jn
/
vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
unio
C
Hamano
Merge branch 'mm/mediawiki-file-attachment
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
bra
n
ch
'
t
r/maint-
s
h
o
w-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hama
n
o
Merge
b
r
a
nch
'mz/rebase-no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbo
n
s
git p4: a
d
d su
p
po
r
t for 'p4
move'
in P4
S
ub
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
R
educe draft
r
elease
notes to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Sy
n
c
w
ith
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
a
mano
G
it 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
M
e
r
g
e
b
ranch 'jc/
m
aint-blame-
u
nique-
a
b
b
r
ev' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Haman
o
Merg
e
branch 'rj/platf
o
rm
-
p
r
ead-may-b
e
-t
h
read-
u
nsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e
bra
n
ch 'th/dif
f
-no-
i
ndex
-
fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 'nd/clo
n
e-single-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
M
e
r
g
e
br
a
nch 'jc/re
v
-
l
ist-simplify-merges-first-
p
arent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C
Hamano
M
erge branch 'hv/submod
u
le-update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch 'jk/diff
-
no-in
d
ex-pag
e
r' into m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Haman
o
Mer
g
e branch 'mm/
v
erify-filena
m
e-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
r
anch 'cn/
c
herry-pick-r
a
n
g
e-docs' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ham
a
no
Merg
e
bran
c
h 'j
c
/ustar-checksum-is-unsign
e
d' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ham
a
n
o
Me
r
ge bra
n
ch 'jc/bundle-
c
omplete
-
notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
M
e
rge bra
n
ch 'jc/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Ham
a
no
M
e
r
ge bra
n
ch
'
j
c/request-pull-match-tagname' into main
t
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
commit: fix "--amend --only" with
no pat
h
spec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
apply: tests f
o
r the --3
w
ay option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff Ki
n
g
add: c
r
eat
e
ADD_
E
DIT
.
patch with mod
e
0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
rerer
e
: make rr-cache fanout d
i
rectory honor u
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: document --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
a
llow rerere()
t
o work on --3way res
u
lts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
r
e
gister con
f
licte
d
stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
apply: --3way wi
t
h
add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
move veri
f
y
_inde
x
_mat
c
h()
hig
h
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: plug the three
-
way m
e
rg
e
lo
g
ic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
apply: fall
b
ack on thr
e
e
-way mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply
:
ac
c
ept -3/--3w
a
y command line op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
an
o
ap
p
ly: move "a
l
rea
d
y exists"
l
og
i
c
to che
c
k_
t
o
_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: mov
e
c
he
c
k
_to_create
_
b
l
ob() clo
s
er to its
s
ole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
furthe
r
s
p
lit
l
oad_preim
a
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply: refa
c
tor "pr
e
vious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply: split
l
oad_preima
g
e(
)
helper fu
n
ction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: factor out chec
k
out_ta
r
get()
h
elper f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply:
r
efa
c
tor read_
f
ile_or_g
i
tl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
app
l
y
:
clear_
i
mage() clears
t
hings a bit m
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a bit more com
m
ents on PATH
_
TO_BE_
D
EL
E
TED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
ma
n
o
a
pply: fix an
i
ncomplet
e
c
ommen
t
in
c
he
c
k_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Alex Rie
s
e
n
Restore umasks influence on the
p
ermissions of work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Chr
i
s Webb
A
llo
w
ed
i
t
of empty message w
i
th c
o
mmit -
-
amend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Mer
g
e git
:
//github
.
com/git-l10n/git-
p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Fifth
bat
c
h for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge branch 'c
w
/help-over-netwo
r
k'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch 'mz/empty-rebase-tes
t
'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge
b
ran
c
h 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branch
'
js/fast-ex
p
ort-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
M
e
rge branch '
c
w/no-
d
e
taching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge
b
ranch
'
v
r
/use-ou
r
-perl-in-t
e
st
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Haman
o
M
e
rge
b
ranch
'
mm/credential-plumb
i
ng'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge
b
r
anch
'jc/maint-
b
lam
e
-unique-a
b
br
e
v'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
ranch 'jn/per
l
-makemaker-l
e
ad
i
n
g-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
Me
r
ge branch 'rj/platform-pread-ma
y
-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch 'mm/con
f
ig
-
xdg'
commit
|
commitdiff
|
tree
2012-07-09
J
o
n
athan Nied
e
r
Makefile: docume
n
t ground r
u
l
e
s
f
or targ
e
t-s
p
ec
i
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Ma
k
efile:
m
o
ve
GIT-VERSION-FILE depen
d
encies c
l
oser
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: build instaweb similar to other scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makef
i
le: up
d
ate scripts when
b
u
ild-time
para
m
et
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefi
l
e: do not r
e
place @@GIT_VERSION@@ in shell scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Kin
g
M
akef
i
le: split prefix
flags fro
m
GI
T
-CFLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nie
d
er
Makef
i
l
e
: be
s
i
l
ent when only G
I
T_
U
S
ER_AGENT changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
M
a
kefile: split GIT_USE
R
_AGE
N
T from
GIT-CFLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Mak
e
file: do not replace @@
G
IT
_
USER_AGEN
T
@@ in scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Kin
g
Makefile: apply
d
e
pende
n
cies consis
t
e
ntly
t
o
spar
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f King
M
a
k
efi
l
e: d
o
not ha
v
e git
.
o
d
ep
e
nd on common-cmds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan
Nieder
Makefile
:
fold XDIFF_H and
VCSSVN_H
i
n
to L
I
B
_
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Torsten Bögershausen
git on Mac OS a
n
d precomposed u
n
icode
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Thomas Gumm
e
re
r
Replace str
l
en() with ce_namelen()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-remote-mediawiki: update co
m
ments to
refle
c
t c
r
ede
n
tia
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-
r
emote-mediawiki: b
e
more defensive when reques
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu M
o
y
git-remote-mediawiki
:
more e
f
ficient
'
pull' in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
t
thieu M
o
y
git-remote-m
e
d
i
a
wiki:
e
xtract revi
s
i
o
n
-i
m
p
orting loo
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-
r
e
m
ote
-
mediawik
i
:
refactor loop o
v
er
revis
i
on ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-medi
a
wiki: change return typ
e
of
g
et_mw_pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN
Ki
m
Thuat
git-remote-mediawik
i
(
t
9
3
63): 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
:
suppo
r
t for uploa
d
in
g
file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
S
i
m
o
n
C
athebr
a
s
g
it-remot
e
-med
i
a
w
i
k
i (t9362)
:
test git-remote-mediaw
i
k
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaum
e
Sasdy
g
i
t-remote
-
m
ediawik
i
(t9361
)
:
t
e
st gi
t
-remote
-
m
e
diawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
llaum
e
Sa
s
d
y
git-remote-m
e
dia
w
iki (t936
0
): test git-re
m
ote-medi
a
wi
k
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
g
it
-
remot
e
-mediawik
i
: tes
t
e
nviron
m
ent of
g
it
-
remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume
Sasdy
g
it-remot
e
-
mediawiki:
s
c
ripts t
o
ins
t
all, d
e
lete and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gibbon
s
git p4: r
e
fa
c
tor d
i
ffOpts calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next