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
Sync with 1.7.11.3
2012-07-09
Junio C H
a
mano
apply: a
l
l
o
w rer
e
re() to work on --3w
a
y results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
apply: re
g
ister conflicted stages to the
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply:
-
-3wa
y
wi
t
h a
d
d/add
co
n
flict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply:
move verify_index_match() hi
g
her
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
app
l
y
:
pl
u
g the three-way
m
erge lo
g
i
c
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
appl
y
: fal
l
back on three-w
a
y merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: ac
c
ept -3/--3way
c
ommand
l
in
e
o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
m
ove "alr
e
ad
y
exists
"
logic to
check_to_cre
a
te()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: move check_
t
o_create
_
blob(
)
closer to its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
ap
p
l
y
: furt
h
e
r
split loa
d
_
p
reimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
ap
p
ly: r
e
factor "previ
o
us patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: split load_preim
a
ge() helpe
r
fu
n
c
tion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ham
a
no
apply: factor out checko
u
t_target()
helper funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: r
e
f
a
ctor read_f
i
le_or_gitlin
k
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image() clears thi
n
gs a bit
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
p
ply: a b
i
t more commen
t
s on P
A
T
H
_TO_BE_DELE
T
ED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
app
l
y: fix an i
n
com
p
lete co
m
ment
i
n check_p
a
tc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riesen
Restore umasks influence on the perm
i
ssions of
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
C
h
ri
s
W
e
bb
Allow e
d
it of
e
mpt
y
message wi
t
h
commi
t
--amend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Ham
a
no
Me
r
ge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
F
ifth batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/help
-
o
ver-ne
t
work'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Mer
g
e branch
'
mz/empty-r
e
base-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bran
c
h 'pw/
g
it-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge branc
h
'js/fast-e
x
port-paths-w
i
th-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ha
m
ano
Merge
branch 'cw/no-d
e
taching
-
an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
Merge br
a
nch 'vr/u
s
e-
o
ur-
p
erl-i
n
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge bra
n
ch 'mm/cred
e
ntial-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
Me
r
ge branch 'jc/
m
aint-bl
a
me-
u
nique-abbr
e
v'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
M
e
rge b
r
a
nch 'jn/perl-makemake
r
-leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Me
r
g
e branch 'rj/pl
a
tform-prea
d
-may
-
be-thread-uns
a
fe
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
a
mano
Mer
g
e branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jona
t
han Nied
e
r
Make
f
ile
:
documen
t
gr
o
und ru
l
es for tar
g
et-specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: move GIT-VERSION-
F
ILE depend
e
ncies closer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: build instaweb
s
imilar to other script
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
ke
f
i
le: update scripts
when build-time paramet
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
ef
f
King
M
akefile: do
n
ot replace @@
G
IT_VERSION@@ in s
h
e
ll
s
cripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
kefile: split
p
refix
flags fro
m
GIT-CFLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonat
h
an Nieder
Ma
k
efile: be
s
ilent when only
G
IT_USER_AGENT ch
a
nges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
King
Makef
i
le: split GIT_US
E
R
_AGENT from GIT-C
F
LAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f King
Makefile
:
do n
o
t rep
l
ace @@GIT_USER_AGENT@@ in
s
cripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: apply
de
p
endencies
c
onsis
t
ently to sparse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Makefile: do not have git
.
o depend on
c
ommo
n
-c
m
d
s
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nied
e
r
Makefile: fo
l
d XDIFF_H and VCSSVN_H into LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Torsten Bögersha
u
s
en
git on Mac OS and p
r
e
c
omposed unic
o
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 Gumm
e
re
r
Replace st
r
len(
)
with
ce
_
namele
n
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-remote-mediawi
k
i
:
update comments to reflect crede
n
tial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tthieu
M
o
y
git
-
remote-mediawiki: b
e
more defe
n
s
i
v
e
when requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matt
h
ieu Moy
g
it-remote-me
d
iawiki: mo
r
e efficient 'pull' in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthie
u
Moy
git-remote
-
mediawiki: ext
r
act re
v
ision-importing
loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Mat
t
hieu Moy
git-rem
o
t
e
-mediawiki: refac
t
or loop over
r
evi
s
ion ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthi
e
u Moy
git-
r
emo
t
e-mediawik
i
: change return type of get_mw_pa
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN Kim
T
huat
g
i
t-remot
e
-medi
a
w
i
k
i (t936
3
):
test 'Fi
l
e:
'
import and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Ma
t
thieu
M
oy
git-remote-me
d
i
a
w
i
k
i: support f
o
r uploading file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Simon Ca
t
h
ebras
g
i
t-remote-mediawiki (
t
9362): test git-re
m
ote-medi
a
wiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sas
d
y
g
i
t-remote-mediawiki (t9361): test g
i
t-remote-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasd
y
git-r
e
m
ote-medi
a
wik
i
(t9360
)
: tes
t
git-remote-
m
ediawik
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-remote-mediawiki: te
s
t environment o
f
git-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-remote
-
me
d
iawiki: scripts
t
o ins
t
all, delete
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
G
ary Gib
b
ons
git
p
4: r
e
factor diffOpts calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete
Wy
c
koff
git p4:
notice Jobs lines in git commit messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckoff
git p4 t
e
s
t
: refact
o
r marshal_d
u
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wyckof
f
gi
t
p4: remove
unused
P4Submi
t
interacti
v
e setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
M
icha
e
l
J
Gruber
t3404: make test 57
work with das
h
and others
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Mat
t
hi
e
u Moy
git-re
m
ote
-
media
w
iki: improve support for
n
on-Eng
l
ish
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourth batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
unio
C
Ha
m
an
o
Merge branch 'nd/clo
n
e-single-
f
ix'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
M
e
r
g
e
branch 'th/diff-n
o
-index
-
fix
e
s'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Ham
a
no
Merge bra
n
ch 'hv/re
m
ote-end-
h
un
g
-up'
commit
|
commitdiff
|
tree
2012-07-03
Jeff Kin
g
pu
s
h: do
n
't guess at q
u
alif
y
ing remote refs on deletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Andreas Sch
w
ab
F
i
x
formatting
i
n git-c
o
nf
i
g(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha
1
_name
.
c
:
t
e
ach get_sh
o
rt_s
h
a1()
a
c
o
m
m
it-only option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
io C Ha
m
ano
sha1_nam
e
.
c: a
l
low get
_
short_sha1() to t
a
ke other flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
get_sha1(): f
i
x err
o
r status regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hama
n
o
sha1_name
.
c: restruct
u
r
e
di
s
ambiguation of short names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C H
a
ma
n
o
sha1_name
.
c: correc
t
mis
n
amed
"
c
a
nonical"
a
nd
"res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
io C Hamano
sha
1
_name
.
c: re
f
actor
f
ind_short_packed_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C
H
amano
s
h
a1_
n
am
e
.
c
:
rename "now"
to
"
curr
e
nt"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
sha1_name
.
c:
clarify
w
hat
"fa
k
e" is fo
r
in find_
s
hort_object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
i
o
C Hamano
s
ha1_na
m
e
.
c: g
e
t rid of get_sha
1
_
w
ith
_
m
ode(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_n
a
m
e
.
c
:
get rid
o
f get_sh
a
1_with_mode
_
1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C
H
amano
Sync
with i18n-po upda
t
es i
n
m
ai
n
t
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Hamano
M
e
rge branch '
m
ai
n
t'
of
g
it:/
/
github
.
com/gi
t
-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
sha
1
_name
.
c:
hide get_sh
a
1_w
i
t
h
_
c
ontext_1() ugliness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
blame:
c
o
m
pute abbrevi
a
ti
o
n width that ensures uni
q
ueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-29
Johanne
s
Sixt
perl/Ma
k
efile: Fix a mi
s
sing double-quote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Haman
o
diff-
i
n
dex
.
c: "git dif
f
"
has no need
t
o re
a
d
b
lob fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
d
i
ff-index
.
c: unify
handling of command line path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-ind
e
x
.
c
:
do not pret
e
nd paths ar
e
pathspec
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
an
o
T
hird
batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge branch 'fc/git
-
prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge br
a
nch
'js/submo
d
ule-
r
elat
i
ve'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Haman
o
M
erge branch 'lk/m
o
re-helpf
u
l-st
a
tus-hi
n
t
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
e
rge branch '
l
k/rebase
-
i
-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
M
e
rge
branch 'jc/rev-l
i
st-sim
p
lify
-
mer
g
es-first
-
pare
n
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
Merge
b
ranch 'hv/s
u
b
module-update-nuke
-
su
b
module
s
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge bra
n
c
h
'
n
d/exclude-workaround
-
top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge branch 'n
d
/stream-pack-obj
e
cts'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
M
e
rge branc
h
'
n
d/stream
-
index-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch
'
mm/ver
i
fy
-
f
i
len
a
me-fix'
commit
|
commitdiff
|
tree
next