repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sl/autoconf'
2012-07-11
Jun
i
o C Hamano
Sync with 1
.
7
.
11
.
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
Junio C
H
a
m
a
no
Merge branch
'
jc/maint-blame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch 'rj/platform-pread
-
ma
y
-be-thread-unsa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge b
r
anch 'th
/
diff-no-inde
x
-fixes' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge bra
n
ch 'nd/
c
l
one-sing
l
e-fix' into main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
M
erge branch 'jc/
r
e
v-list-si
m
plify
-
mer
g
es-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Me
r
ge branch 'hv/su
b
m
o
dule-update-nuke-s
u
bmodul
e
s'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C
Hamano
Merge branch
'
j
k/diff-no-
i
n
d
ex-pager'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge br
a
nc
h
'
mm/verify-filena
m
e-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge br
a
nch 'cn
/
cherr
y
-pick-range-docs' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge
branch 'jc/ustar-checks
u
m-is-unsigned' into
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
Merge br
a
nch '
j
c/bundle-complete-notice'
i
nto
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branc
h
'jc/l
s
-file
s
-i-
d
ir' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/req
u
est-p
u
ll
-
match-tagname' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gumme
r
er
Strip namele
n
out o
f
ce_fla
g
s into a ce_na
m
elen field
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e branc
h
'tg/maint-cache-name-compare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_name_compare(): do not truncate whil
e
com
p
aring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
e
ff King
inde
x
-pack: loop w
h
i
l
e
infla
t
in
g
o
b
jects in unpack_data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
co
m
mit: fix "--amend --only" with no pat
h
s
p
ec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
un
i
o C
Hamano
apply: tests f
o
r
t
h
e
--
3
w
ay option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Je
f
f King
a
dd: create AD
D
_EDIT
.
p
a
tch with mode 0666
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C Hamano
f
i
lte
r
-
branch: do not forget the '@' prefix
t
o force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse --dis
a
mbigu
a
te=<
p
ref
i
x>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
rev-parse: A and B in
"
rev-parse
A
.
.
B" refer t
o
c
ommitt
i
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
rese
t
: the command takes
c
ommitti
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
commit-t
r
ee
:
t
he command wan
t
s a
tree and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: --bu
i
ld-fake
-
ancestor expe
c
ts blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
sha1_name
.
c:
add sup
p
o
r
t f
o
r disambiguating oth
e
r types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
r
e
vision
.
c: the "log"
f
amily, except for "
s
how
"
,
t
a
k
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revision
.
c
:
al
l
ow han
d
l
e
_
revi
s
ion_arg() to take ot
h
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
sha1_name
.
c: in
t
roduce get_sha1_commi
t
tish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
sha1_name
.
c: teach lookup context to get_sha1_with_context
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
Hamano
sha
1
_
n
ame
.
c: many short names ca
n
only be co
m
mi
t
tish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
sha1_name
.
c:
g
et_sha1_1() takes lookup
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_na
m
e
.
c
:
get_des
c
ribe_name() by def
i
nition g
r
oks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
rerere: make rr
-
cache fa
n
out directory
h
onor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
a
no
apply: docume
n
t
-
-3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: allow rerere() to work
o
n -
-
3way resu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
l
y
: r
e
gister confl
i
c
t
ed stage
s
to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
a
p
ply:
-
-3wa
y
with add/add c
o
nf
l
i
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
ap
p
l
y: m
o
ve ve
r
ify_index_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Ha
m
an
o
a
pply: plug the t
h
ree-way me
r
ge
logic i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
apply: fall bac
k
o
n
three-
w
ay merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: ac
c
ep
t
-3/--3way command l
i
ne opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: move
"
alrea
d
y e
x
i
sts" lo
g
ic to check_to
_
create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
m
ove check_to_create_blob() closer
t
o
i
t
s
so
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
p
p
ly: further split load_preima
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply:
r
efact
o
r
"
previous patch"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
ppl
y
:
s
plit l
o
ad_preimage() h
e
lper
functi
o
n out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply: factor out
c
heckout_ta
r
get() helper func
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C Hamano
app
l
y: r
e
factor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply
:
clear_image() clears things a bit
m
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: a bit more comments on PATH
_
TO_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
apply: f
i
x
a
n incomple
t
e
comment in check_patch
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ale
x
Ri
e
sen
R
e
store umasks influenc
e
on th
e
permissions of
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Chri
s
W
ebb
Allow
e
dit of empty
m
e
ss
a
ge w
i
th commit --amend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
g
i
t://g
i
t
h
u
b
.
com/g
i
t
-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
n
o
Fifth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch 'cw
/
he
l
p-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mz/empty-re
b
ase-test'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge branch 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branch 'js
/
fas
t
-
e
xport-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge
b
ranch
'
c
w
/no-detachin
g
-an-unborn
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'vr/use-our-perl-in
-
tests'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
Merg
e
b
ranch 'mm/credential-plumbing
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
Mer
g
e
b
ranch
'
j
c/maint-blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
M
erge branch
'jn/perl
-
mak
e
m
aker-lead
i
ng
-
p
aths
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
Merge branch 'rj/
p
latform-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge
branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n N
i
eder
Makefile: docum
e
nt g
r
ound rules for target-specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
ng
M
akefile: mo
v
e
GIT-VER
S
ION-FILE depen
d
encies
c
l
oser
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff Kin
g
Makefil
e
: b
u
ild
insta
w
eb similar to other
s
c
ripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Je
f
f Kin
g
Makefile: up
d
ate scrip
t
s when
build-time
parameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
Ki
n
g
M
akefile: do not r
e
place
@
@
GIT_VERSION@@ i
n
shell
s
c
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Make
f
ile: split prefix fla
g
s from
GIT-CFLAG
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonat
h
an Nied
e
r
Ma
k
efile: be sile
n
t when only
GIT
_
USER
_
AGENT changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jef
f
K
ing
Makefile:
split G
I
T_USER_AGENT
f
rom GIT-
C
FLA
G
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
akefile: do no
t
repl
a
ce @@G
I
T_USER_AGENT@
@
in scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
akefil
e
: a
p
ply
d
e
p
e
ndencies consistently to sparse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Mak
e
f
i
le: do
n
o
t
have
g
i
t
.
o
d
e
p
end
o
n common-c
m
ds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jon
a
than Nieder
Makefile
:
fold XDIFF_H and VCSS
V
N_H into LIB_H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
T
o
rsten Bö
g
e
r
s
hau
s
e
n
git on Mac OS and precomposed 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 strle
n
() wit
h
ce_na
m
ele
n
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthie
u
Moy
g
i
t-remote-med
i
awik
i
: update comments
t
o re
f
lect cre
d
entia
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawiki:
b
e more defen
s
ive wh
e
n r
e
quests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthie
u
M
o
y
git-re
m
ote-mediawiki: m
o
r
e
e
f
ficient 'p
u
l
l' in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote
-
med
i
a
wiki: extract rev
i
si
o
n-importing loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tt
h
ieu Moy
g
i
t-remote
-
mediawiki: refactor
lo
o
p over revision ids
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
M
a
tt
h
ieu Moy
git-remote-mediawik
i
: cha
n
ge return type of get_mw_pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
NGUYEN Kim Thuat
gi
t
-
r
emote-mediawiki (t9363): test '
F
ile:'
import and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-mediawik
i
: support
f
or upl
o
ad
i
ng f
i
le in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Simon C
a
thebr
a
s
git-remote-mediaw
i
k
i (t9362): test git-remote-mediawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
G
u
illaume
Sa
s
dy
git-remote-m
e
diawi
k
i
(
t9361): test git-remote-
m
e
d
iawiki
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume
S
asdy
git-remo
t
e
-
mediawiki
(t93
6
0
)
: test
git-remote
-
med
i
awik
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
llaume
S
asd
y
gi
t
-rem
o
te-mediaw
i
k
i
:
test
env
i
r
o
n
ment o
f
git-remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-remote-medi
a
wi
k
i: scripts to install, del
e
te a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Gary
G
ibbons
git p4: refactor diffOpts calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pe
t
e
Wyckoff
git p4: notice Jobs
l
ines
in git c
o
mmit messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Pete Wy
c
koff
g
i
t p4 test:
r
e
fac
t
or
m
arshal_dump
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next