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
Junio
C
H
amano
Sync with 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e
branch 'jc/mai
n
t-blame-uniq
u
e
-a
b
br
e
v' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Haman
o
Merge
branch 'r
j
/platform-pread-m
a
y-be-thre
a
d
-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge bra
n
ch 'th/d
i
ff-no-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Ham
a
no
M
e
rge b
r
anch 'nd/clone-sing
l
e-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Me
r
ge
branch 'jc/rev-l
i
st-simp
l
ify-merges-f
i
r
s
t
-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'h
v
/submodul
e
-update-nu
k
e-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jk/diff-no-inde
x
-
p
ager' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
M
e
rg
e
branch 'mm
/
verify-filename-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
Hamano
Merge br
a
n
ch
'
cn/c
h
e
rry-pi
c
k-range-docs'
in
t
o maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/u
s
t
a
r-checksum
-
is-uns
i
gne
d
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch
'jc/bundle-complete-notice
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge b
r
a
n
c
h 'jc/
l
s-files-i-dir' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
Merge
b
r
anch 'jc/request
-
pull-match-tagname'
i
n
to
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Thomas Gum
m
er
e
r
S
t
rip namelen out of ce_f
l
ags into a ce_namelen field
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
no
Merg
e
b
ranch 'tg/maint-ca
c
he-name-comp
a
re' i
n
to tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
cache_name_c
o
mpa
r
e()
:
do not tru
n
cate
while comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
eff
King
inde
x
-
p
ack: loop while in
f
l
a
ting objects in unpack_data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
eff
K
ing
comm
i
t
:
fi
x
"--amend --only
"
with no pathspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C
Hamano
apply: te
s
ts
f
or
the
--3wa
y
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jeff Ki
n
g
a
d
d: cre
a
te ADD_EDIT
.
p
a
tch with mode 0666
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C Hamano
filter
-
b
r
a
nch: do not forget the '@' prefix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
rev-par
s
e
--disambigua
t
e=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rev-parse
:
A
a
nd B in "rev-
p
arse A
.
.
B" refer to c
o
mmittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
reset: the command ta
k
es comm
i
ttish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
c
ommit-tree: the co
m
mand
w
a
n
t
s
a
tree and commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: -
-
build-fake-ancestor expects blob
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Ha
m
a
n
o
sha1_name
.
c: add su
p
port for disambigu
a
ting other
types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
revi
s
ion
.
c: the "log" family, e
x
cept fo
r
"show
"
, t
a
kes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
mano
revision
.
c: allow han
d
le_revision_arg() to
take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
s
ha1_n
a
me
.
c: introdu
c
e get_sha1_co
m
mitt
i
sh(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
sha1_n
a
me
.
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 Haman
o
s
ha1_name
.
c
:
many short names can
only be committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c
:
get_sha1
_
1() ta
k
es lookup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
s
h
a1_nam
e
.
c: get_descri
b
e_name() by
d
e
fini
t
ion
groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: mak
e
rr-
c
ache fanout
directory ho
n
or uma
s
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
p
p
l
y: do
c
ument --3wa
y
o
pt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
allow rerere()
t
o
work on --3way result
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: register confl
i
cted
s
t
ages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
apply:
-
-3
w
ay with add/add co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
app
l
y
: mo
v
e ver
i
fy_index_match() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
appl
y
: plug the three-way
m
erge l
o
gic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: fall back o
n
three-
w
ay merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: accept
-
3/--3way command
l
ine op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: mov
e
"alr
e
ady e
x
ists" logic
t
o
check_to_cr
e
ate
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Haman
o
apply:
m
o
ve c
h
eck_to_create_blob() clo
s
er
t
o it
s
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
app
l
y: further split load
_
p
r
eim
a
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C
Hamano
apply: ref
a
ct
o
r "previous pa
t
ch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
ppl
y
: spl
i
t load_
p
r
eimage() helper func
t
ion out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
pply: f
a
c
tor out check
o
ut_target(
)
h
el
p
er
fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
a
ppl
y
: refactor
read_fil
e
_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image(
)
cle
a
rs things 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
c
o
mment
s
o
n
P
A
TH_TO_B
E
_DE
L
E
T
ED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply: fix an
i
ncomplete comment
i
n check_p
a
tc
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
A
lex Riesen
Restore umask
s
influence on the p
e
rmis
s
ions
of work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Chris
W
ebb
Allo
w
edit of e
m
pt
y
mes
s
age
w
ith co
m
mit --amend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Fifth batch
f
or 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch
'cw/
h
elp-over
-
network'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
a
no
Merge branch 'mz/empty-rebase-t
e
st
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
nch 'pw/git-p
4
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'js/f
a
st-export-pat
h
s-wit
h
-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'cw/no-detaching-an-un
b
orn'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Ha
m
ano
Merge branc
h
'
vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch
'
m
m/c
r
e
d
ential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
Merge br
a
nch 'jc/maint-
b
lame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'jn/perl-make
m
a
k
er-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
br
a
nch 'rj/platform-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bra
n
ch 'mm/c
o
nfig-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jonath
a
n Nieder
Make
f
ile: docum
e
nt g
r
ou
n
d rules for target-spe
c
ific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Ma
k
efil
e
:
m
ov
e
GIT-VERSION-FILE dependenc
i
es c
l
os
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
Ma
k
efi
l
e: build instaweb simi
l
ar to other
scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Mak
e
file:
updat
e
scripts when build-ti
m
e parame
t
ers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile:
d
o
not repl
a
c
e @@GI
T
_
V
ERSION@@ in
she
l
l scr
i
pts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefile: split pre
f
ix flags
f
rom GIT-CFLAGS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nied
e
r
Makefile: be silent when only GIT_USER
_
A
G
ENT changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff
King
Makefile: split GI
T
_
U
SER_AGENT from
GIT-CFL
A
GS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Kin
g
Mak
e
file: do not
r
eplace @
@
GIT_USER_AGENT@@ in
s
crip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
akefile: apply dependenci
e
s c
o
nsistently to sparse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Makef
i
le: do not have git
.
o
depend o
n
common-cmds
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan
N
ieder
Makefile: fold XDI
F
F_H and VCSSV
N
_H int
o
LIB_H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Torste
n
Bögershause
n
g
i
t on Mac OS
a
n
d 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 G
u
m
merer
Repla
c
e strlen() with c
e
_namelen(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
M
atthieu M
o
y
git-remote-me
d
iawiki: up
d
ate comm
e
n
ts to reflect cre
d
enti
a
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remo
t
e-m
e
diawiki: be m
o
re def
e
ns
i
ve w
h
e
n
requests
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matth
i
e
u
Moy
gi
t
-remote-mediawik
i
: mo
r
e efficient '
p
ull'
i
n t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
M
atthieu Moy
git-remo
t
e-mediawiki: e
x
tract revis
i
o
n-
i
mp
o
r
t
i
ng
loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matt
h
ie
u
Moy
git-remote-mediawi
k
i
:
refactor loop over revision i
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu
Moy
git-
r
emote-mediawiki: c
h
ange ret
u
rn type of get_mw_pages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
N
GUY
E
N Kim
Thuat
git-re
m
ote-mediawiki (t9363): test 'File:' import and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Mo
y
git-re
m
ote-media
w
iki:
s
upport
for uploading
file in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Sim
o
n C
a
thebras
git-r
e
mot
e
-mediawiki (t9362): test gi
t
-remote-m
e
diawiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
gi
t
-rem
o
te-med
i
aw
i
ki (t9
3
61
)
:
test gi
t
-rem
o
te-med
i
awiki
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guillaume Sasdy
git-remote-me
d
i
awiki
(
t9360): test git-remote-me
d
iawik
i
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Guill
a
ume S
a
sdy
git-remote-mediawiki: test environ
m
ent
o
f
git-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gu
i
lla
u
me
S
as
d
y
git-rem
o
te-mediawiki: scripts t
o
insta
l
l, dele
t
e and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Gary Gi
b
bons
git p
4
: refactor diffOpts calc
u
lation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
Pete
Wyckoff
git p4: no
t
i
c
e Jobs lines in
g
it commit
m
es
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-06
P
e
te Wyckoff
git p4
t
e
st: refa
c
tor marshal_dum
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next