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
Me
r
ge
b
ra
n
ch 'jk/maint-c
o
m
m
i
t-amend-only
-
no-paths'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C H
a
m
ano
Merge
b
ranch
'
c
w/a
m
end
-
commit-without-messag
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
am
a
no
Merge branch
'
jn/makefile-
c
l
eanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'ar
/
c
lone-honor
-
umask-a
t
-top'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hama
n
o
Merge bra
n
ch
'j
c
/apply-
3
way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hama
n
o
Merge br
a
nch
'cw/reba
s
e-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio
C
H
amano
Merge br
a
nc
h
'pw/git-p4-move
'
commit
|
commitdiff
|
tree
2012-07-14
Juni
o
C Hamano
Merge branch 'pw/git-p4-
j
obs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge b
r
anch 'jk/push-d
e
l
e
t
e-ref-er
r
or-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Sixth ba
t
ch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
M
erge br
a
n
ch
'jc/refactor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bra
n
ch 'tg/ce-name
l
en'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Ha
m
ano
Me
r
ge br
a
nch 'tb/sanitize-decomposed-u
t
f-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Ha
m
ano
M
erge bran
c
h 'mm/mediaw
i
k
i
-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
M
e
rge branch 'jn/vcs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hama
n
o
M
e
rge branch
'
mm/me
d
iawi
k
i-file
-
attachments
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
amano
Merge b
r
anch
'tr/maint-
s
how-w
a
lk'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge branch
'
mz/
r
eba
s
e-no-
m
box'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
git p4:
a
dd
s
upport for 'p4 move'
i
n P4Submi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
mano
R
e
duce d
r
aft release notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
mano
Sync
with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Git
1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ham
a
no
M
erge branch 'jc/m
a
in
t
-blame-uniq
u
e-abbrev
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
a
man
o
Merge branch '
r
j
/
platform-pread-may-
b
e-thread-unsaf
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge branch 'th/diff-
n
o-index-fixes' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Mer
g
e b
r
anch 'nd/clone-s
i
ngle-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
ano
Merge bran
c
h
'jc/rev
-
l
i
st-
s
implify-mer
g
e
s
-firs
t
-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Mer
g
e branch 'hv/submodule-update-nuke-submodules
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
Me
r
ge branc
h
'jk/diff-n
o
-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
amano
Mer
g
e br
a
nch 'mm/verify-filename-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'cn
/
c
herry-pick-range-docs' into
maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io
C
Ha
m
ano
Merge
b
ranch
'jc
/
ustar-ch
e
cksum-is-u
n
signed
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge branch 'jc/bun
d
le-complete-n
o
tice' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 'jc/ls-files-i
-
d
i
r' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
Hamano
Merge bra
n
ch
'jc/request-pull-match-tagname'
into main
t
commit
|
commitdiff
|
tree
2012-07-10
Jeff
King
commit:
fix
"
--amend --
o
nly" with
n
o path
s
pec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
app
l
y
:
tests for the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff K
i
n
g
a
d
d: create
A
DD_EDIT
.
p
a
tch with
mode
0
666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
rerere: make rr-cache f
a
nou
t
d
irectory
h
onor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: document --
3
way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
ap
p
ly: allow rere
r
e
(
)
t
o
work on
--3w
a
y re
s
ul
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Ham
a
no
a
p
ply: r
e
gist
e
r c
o
n
f
l
icte
d
sta
g
es to t
h
e ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way
wit
h
add/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: move v
e
rif
y
_index_ma
t
ch() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C
Ham
a
no
app
l
y:
plu
g
t
he three-way merge lo
g
ic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fall
b
ack on
t
hree-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: accept -3/--3
w
ay comman
d
line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: move "alrea
d
y exi
s
ts"
logic to
c
heck_to_cre
a
te()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: move chec
k
_to_cre
a
te_blob() closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
apply: fur
t
her split loa
d
_
p
reima
g
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refactor "previous patch
"
l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
y
: spl
i
t load_preimage() hel
p
e
r
function
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
apply:
factor
o
ut c
h
e
c
k
out_targe
t
() helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hama
n
o
apply:
refactor read
_
file_or_
g
itl
i
nk()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
appl
y
: c
l
ear_ima
g
e
() clears things
a bi
t
more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
apply: a bit more c
o
mm
e
nts
o
n PATH_TO
_
BE_DELETE
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: fix an incomplete comment in check_pa
t
ch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Al
e
x R
i
es
e
n
Re
s
t
o
r
e
u
masks influence
on t
h
e permissions of work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Al
l
ow edit of empty m
e
ssa
g
e
w
ith commit --
a
m
end
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge git://github
.
com/g
i
t-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
Fifth batch
f
or 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge branc
h
'cw/h
e
lp
-
ove
r
-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mz/emp
t
y-r
e
base-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
Mer
g
e bran
c
h 'pw/git
-
p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
Me
r
ge branch 'js/fast-export-paths
-
with-space
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Mer
g
e branch
'cw/no-detaching-an-unbo
r
n'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branch 'vr/use-o
u
r-perl-i
n
-
t
est
s
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Me
r
ge branch 'mm/
c
redential-p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
Merge branc
h
'jc/mai
n
t-blame-
u
nique-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge b
r
anch '
j
n/pe
r
l-m
a
kemaker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
Me
r
ge branch 'rj
/
platfo
r
m-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
e
rge branch 'mm/config-x
d
g'
commit
|
commitdiff
|
tree
2012-07-09
Jon
a
t
han N
i
eder
M
a
kefile:
d
oc
u
ment ground ru
l
e
s for t
a
rget-specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff Ki
n
g
M
a
kefile: move
G
IT-VE
R
S
I
O
N
-FILE depe
n
dencies
c
loser
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
ng
Makefile: buil
d
in
s
taweb
sim
i
lar
t
o othe
r
s
cri
p
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
k
efile: upda
t
e scr
i
pts
w
h
e
n bu
i
ld-time parameters
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
Makefile: do not
r
eplace @@
G
IT_VERSION@@ in
shell scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff King
Make
f
ile: split pr
e
fix flags fr
o
m
GIT-CFL
A
GS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefile: be silent when on
l
y GIT_
U
SER_AGENT ch
a
ng
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: s
p
l
it
GIT
_
USER_AGEN
T
from GIT-
C
FLA
G
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f King
Makefile: do not
r
eplace @@GIT_U
S
E
R_AGENT@@ in
s
cripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff
K
i
ng
Ma
k
e
file:
appl
y
dependencies
c
onsist
e
ntly t
o
spar
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: do not h
a
v
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
Makefil
e
:
f
old X
D
IFF_H and
V
CSSVN_H into LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Tors
t
en Bögershausen
g
i
t
o
n
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
Thomas Gummerer
Replace strlen() with c
e
_namel
e
n(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-remote-med
i
awi
k
i:
u
pdate comments to reflect credential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
a
t
th
i
e
u
Moy
git-remot
e
-me
d
iawiki: b
e
mor
e
defensive when reques
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
th
i
eu Moy
git-remote
-
mediawiki: mor
e
efficient 'pull' i
n
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git
-
re
m
ote-
m
edia
w
iki: extract revisio
n
-i
m
porting loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote
-
medi
a
w
iki: refac
t
or
l
oop
over revisi
o
n i
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
thie
u
M
oy
g
i
t
-
remo
t
e-medi
a
wiki: change
r
eturn type of ge
t
_mw_pag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN
Kim Thuat
git-remote-mediawiki (t
9
363):
t
est 'File:'
import and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawik
i
: su
p
po
r
t for uploading file i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Simon Cathebr
a
s
git-r
e
mote-mediawiki
(
t
9
362)
:
test
g
it-re
m
ot
e
-m
e
diawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
uilla
u
me Sasdy
git-
r
e
mote-mediaw
i
ki (t9361): t
e
s
t
git-remot
e
-mediawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
G
u
illa
u
me Sasd
y
git
-
remote-mediawiki (t9
3
60): test
g
it-re
m
ote-m
e
diawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gui
l
la
u
me
Sasdy
git-remote-
m
edia
w
iki: t
e
st environment
of git-remo
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-r
e
mote-media
w
iki: scripts to install, delete and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gi
b
bons
g
i
t p4
:
refa
c
tor diffOpts
calculation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next