repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'da/difftool'
2014-10-20
Ju
n
io
C Ha
m
a
n
o
M
e
rge branc
h
't
a
/config-
s
et'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hama
n
o
Merge branch
'jk/test
-
she
l
l-trace'
commit
|
commitdiff
|
tree
2014-10-20
J
un
i
o C H
a
mano
Merge br
a
nch 'bc/asciid
o
c'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
a
m
ano
Revert "archiv
e
:
h
onor tar
.
umask
even fo
r
p
a
x head
e
r
s"
commit
|
commitdiff
|
tree
2014-10-20
Torsten Bögershausen
core
.
filemode may need manual
a
c
t
i
on
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Philip Oakley
doc: fix
'git status
--help' character quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
W
.
Trevor King
t1304: Set LOGNA
M
E even if
USER is unset
o
r null
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Etienne Buira
Handl
e
atex
i
t list internaly for unt
h
readed builds
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff Ki
n
g
drop
add_object_array_with_mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Ra
m
say Jones
r
e
vision: remove def
i
nition of
u
nused 'add_objec
t
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Re
n
é Scharfe
u
s
e e
n
v_
a
rr
a
y member of str
u
ct child_process
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
René Sch
a
rfe
run-command: add env_array
,
an
o
p
tional a
r
gv_ar
r
ay
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jef
f
K
i
n
g
pac
k
-object
s
: turn of
f
bitmaps when we spl
i
t packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
p
ack
-
o
b
j
ects: doubl
e
-check options befor
e
disc
a
rding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
repack: pa
c
k
o
bjects
me
n
tio
n
ed by the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff K
i
ng
pack-objects: use argv_array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff
K
i
ng
r
e
achab
l
e: use revision m
a
chinery's --indexed-obj
e
cts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
rev-list
:
add
-
-indexed-ob
j
ects option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff
King
r
ev-list: document --reflog option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
t5516: test pushing a tag of
a
n oth
e
rwise unreference
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff
K
ing
traverse_commit_list: s
u
ppo
r
t p
e
n
d
ing blobs/trees with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge branch 'jc/completion-n
o
-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
H
a
m
ano
Merge branch 'b
w
/trace-no-inlin
e
-getna
n
otime'
commit
|
commitdiff
|
tree
2014-10-16
J
unio C Hamano
Merge bra
n
ch 'p
o
/everyday-doc'
commit
|
commitdiff
|
tree
2014-10-16
R
o
land Mas
gitweb: use
s
tar
t
_form, not startfo
r
m that w
a
s removed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
ar
t7
6
10-m
e
rget
o
ol
:
ad
d
te
s
t cases for m
e
rgetool
.
writeToT
e
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
me
r
getool:
add an option for writing to a tem
p
orar
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
merg
e
tool
:
use
more
conserva
t
ive temporary filenames
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
uilar
t
e
st-lib-functi
o
ns: adjust sty
l
e to matc
h
Cod
i
ng
G
uidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t7610
-
mergetool: use test_config
to
i
solate
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
merg
e
tools/m
e
ld: make u
s
age o
f
`--outpu
t
` configurable
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
eff Kin
g
m
ake
a
d
d_
o
bje
c
t
_array_with_
c
ontex
t
int
e
rface m
o
re sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
King
write_sha1_file: f
r
eshen existing objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
p
a
c
k-objects: match prune l
o
gic for discarding objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
pack-objects: refactor unpack-unre
a
chable expiration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
prune:
kee
p
obje
c
ts reachable
f
rom r
e
cent
o
bjects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff Kin
g
sha1_file: add for_each iterators fo
r
loose
and packed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff Ki
n
g
co
u
nt-objects: use f
o
r
_
each_loo
s
e_file_in_objdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff K
i
ng
count-ob
j
e
cts
:
d
o
not
use xsize_t wh
e
n countin
g
object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff Kin
g
prune-
p
a
cked: use for_ea
c
h_loose_
f
i
l
e_in_o
b
jdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff
King
reachable: mark index
b
lobs as SEEN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
prune
:
factor out loose-object directory
t
raversal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
e
ff King
re
a
chable: reuse
r
e
vision
.
c
"
add all reflogs" code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff Kin
g
rea
c
habl
e
:
use
traverse
_
commit
_
list inste
a
d of custom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Je
f
f Ki
n
g
clean up name al
l
ocation i
n
pr
e
p
a
re_rev
i
sion_walk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
o
b
ject
_
a
rray: a
d
d
a "clear
"
functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
e
f
f Kin
g
object_a
r
ray: fa
c
t
or o
u
t slopbuf-freeing logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff
Ki
n
g
isxdigit
:
c
a
st input to unsigned
c
har
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
foreach_alt_odb: p
r
opagate retu
r
n value f
r
om c
a
llback
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian
S
chube
r
th
contacts
:
add a
Makefil
e
t
o
generate docs and install
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian
Schu
b
e
rth
subtree: add a
n
i
nstall-html
tar
g
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arles Baile
y
difftool: don't assume that d
e
fau
l
t
s
h is s
a
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
merg
e
tool: don't
require a wor
k
t
r
ee for --tool-
h
elp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David A
g
uilar
git-sh-setup
:
mo
v
e
GIT_DIR initializati
o
n into a funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
mergetool: use
m
ore conserv
a
tive tempo
r
ary
f
ile
n
a
mes
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
e
st-li
b
-
f
u
n
c
tions:
a
dju
s
t
style t
o
ma
t
ch
C
o
dingGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
610-merge
t
ool
:
p
r
efer test
_
config over gi
t
config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
610-merget
o
o
l
: add missin
g
&&
an
d
remove commented
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
av
i
d Ag
u
ilar
t7610-mergetool: use tabs instead of a mix of tabs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
b
rian
m
.
carl
s
on
Docum
e
n
t
a
tion: imp
l
emen
t
link
g
it ma
c
r
o
for Asciidoctor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
b
r
ian
m
.
carl
s
on
Documentation: move some Asci
i
Doc parameters into variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref_transaction_commit:
b
ail
out
on failure to
r
emo
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jona
t
han Nieder
lockfi
l
e:
remove unable_to_loc
k
_e
r
ror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonat
h
an Nieder
refs
.
c
: do not permit e
r
r ==
N
ULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie
Sah
l
b
e
rg
remote rm
/
prune
:
print a message when wr
i
ting pac
k
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahlberg
for-
e
ach
-
ref
:
skip and w
a
rn about
b
roken ref names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
ni
e
Sahlberg
refs
.
c: allow
l
is
t
i
n
g and delet
i
ng badly na
m
e
d
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
t
est: p
u
t te
s
ts
f
or handli
n
g of
bad ref
n
a
m
es i
n
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Niede
r
packed-ref cache:
f
o
rbid dot-components in refnam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahl
b
erg
b
r
anch -d: simp
l
ify by using
R
ESOLVE_R
E
F_READING
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
branch -
d
: avoid repeated s
y
m
ref re
s
olution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Hamano
r
eflo
g
test: t
e
st inte
r
a
c
t
i
on wit
h
d
e
tached HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
refs
.
c: cha
n
ge resolve_ref_unsafe reading
a
rg
u
me
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
refs
.
c: make write
_
ref_sha
1
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
fet
c
h
.
c:
change s_update_ref to use a ref transaction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahl
b
er
g
refs
.
c: ref_transact
i
on_commi
t
: distinguish name conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlber
g
refs
.
c: pass a li
s
t of names to skip to is_
r
efname
_
availab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
refs
.
c: call
lock_r
e
f_sha1_basic dire
c
tly
from
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlbe
r
g
ref
s
.
c:
refuse to
l
o
ck badly named r
e
f
s
in lock
_
ref_sha1_basic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
rename_ref: don't ask read_ref_full where the
re
f
came
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
refs
.
c: pass the
r
e
f
l
og message to
_create/delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sah
l
be
r
g
refs
.
c: add an err argument to
d
elete_ref_loo
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
wrapper
.
c
:
add a new function
u
nlink_or_msg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
ni
e
S
ahl
b
e
r
g
refs
.
c: l
o
ck
_
ref_sha1_b
a
sic
i
s used for
a
l
l refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlbe
r
g
wra
p
per
.
c: remove/unlink_or
_
w
a
rn: simpli
f
y
,
treat ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
ona
t
ha
n
N
i
ed
e
r
mv test: recr
e
ate mod/ director
y
instead of relying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jo
h
n
Szakmeis
t
e
r
complet
i
on: silence
"fatal: Not
a git
r
e
pository" e
r
r
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
color
_
parse:
d
o
no
t
mention vari
a
b
le name in er
r
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan Nieder
pass
c
onf
i
g slo
t
s as pointers ins
t
ead of offsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o
C Hama
n
o
U
p
date d
r
aft r
e
lease notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'bc/asciido
c
-pretty-formats-f
i
x
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge br
a
nch
'
r
s
/p
l
ug
-
leak
-
in-bundle'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Hamano
Merge bra
n
ch
'
rs/more-use
s
-of-s
k
ip-pref
i
x'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
Merge bran
c
h
'rs/mailspl
i
t'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Hamano
Merge
branch 'rs/sha1-ar
r
ay-tes
t
'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C
H
amano
M
erge bra
n
ch 'mh/l
o
ck
f
ile-s
t
dio'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Hama
n
o
Merge branch 'mh/l
o
ckfil
e
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge
b
ranch
'sk/tag-contains-
w
o
-
rec
u
rsion'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hamano
Merge
branch
'
da
/
c
ompl
e
ti
o
n
-show-sign
a
ture'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hamano
M
erge
b
r
a
nch '
r
s/d
a
e
m
on
-
fixes'
commit
|
commitdiff
|
tree
next