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 'wk/t1304-wo-USER'
2014-10-24
Junio C Ham
a
no
Merge branch 'wk/t1
3
04-wo-
U
S
E
R'
commit
|
commitdiff
|
tree
2014-10-24
J
u
nio C Hamano
Merge branc
h
'tb/core-f
i
lemode-doc'
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
Merge branch
'
r
s/run-comman
d
-env-array
'
commit
|
commitdiff
|
tree
2014-10-24
Junio C
H
amano
Me
r
ge
b
ranch 'po/doc-statu
s
-m
a
rkup'
commit
|
commitdiff
|
tree
2014-10-24
Juni
o
C H
a
mano
Me
r
g
e
b
ranch 'jk/pack-
o
bj
e
cts-no-bitmap-when-splitting'
commit
|
commitdiff
|
tree
2014-10-21
Junio
C H
a
mano
Up
d
ate dr
a
ft rele
a
s
e
no
t
e
s
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Junio C Haman
o
Merg
e
branch 'js/co
m
pletio
n
-
hide
-
not-a-
r
epo'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge bran
c
h
'da/mergetool-meld'
commit
|
commitdiff
|
tree
2014-10-21
Junio C
H
a
mano
Merge
b
r
anch 'da/mergetool-t
e
mpo
r
ary-d
i
r
e
c
tory'
commit
|
commitdiff
|
tree
2014-10-21
Junio C
H
amano
Merg
e
branch 'da
/
mergetool-tool-h
e
lp'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge b
r
an
c
h
'd
a
/me
r
get
o
ol-
t
emporar
y
-
f
i
l
ename'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C Hamano
Merge b
r
a
nch 'da/me
r
getool-tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merg
e
branch
'rs/ref-transact
i
on'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C Hamano
Update draft release notes
to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io
C
H
amano
Mer
g
e br
a
n
ch
'cc/inte
r
pret-trailers
'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io C Hamano
Merge br
a
nch
'
r
m/gitweb-sta
r
t-form'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io C
H
amano
Merge
branch 'ss/
c
ontri
b
-
s
ubtre
e
-
c
ontact
s
'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C Hamano
Merge
branc
h
'jn/parse-config-slot'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
e
r
ge branc
h
'rs/receive-pack-a
r
gv-leak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Ham
a
no
Merge b
r
a
n
ch
'ta/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
ano
Merge branch 'jk/tes
t
-shell-trace'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hama
n
o
Me
r
ge branch
'
bc/
a
sci
i
doc'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Hamano
Reve
r
t "archive: honor tar
.
umask even for p
a
x heade
r
s"
commit
|
commitdiff
|
tree
2014-10-20
T
orste
n
Bögershausen
core
.
fi
l
emo
d
e ma
y
ne
e
d manual a
c
tion
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
P
h
ili
p
Oak
l
ey
d
o
c: f
i
x
'git status --help' characte
r
quotin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
W
.
Trevor King
t1304: Set LOGNAME even if U
S
E
R
i
s un
s
et
or null
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
René
S
char
f
e
u
se
env_
a
r
r
ay
m
e
m
ber of
struct child_pr
o
cess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Ren
é
S
charfe
run-com
m
and
:
add en
v
_a
r
ray, an
op
t
ional a
r
gv
_
array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
J
eff King
pack-obj
e
cts: turn off bitmaps wh
e
n
w
e split packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Junio C Ha
m
ano
Mer
g
e br
a
n
ch 'jc
/
completion-no-
c
hd
i
r'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Haman
o
Me
r
ge
b
r
anch
'
bw/tr
a
c
e
-no-inli
n
e-g
e
tnanotim
e
'
commit
|
commitdiff
|
tree
2014-10-16
Jun
i
o C Hamano
Merge branc
h
'po/everyday-do
c
'
commit
|
commitdiff
|
tree
2014-10-16
Rolan
d
Mas
gitweb
:
use st
a
rt_form, not s
t
artform that wa
s
removed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguila
r
t7610-merg
e
tool: add t
e
s
t
c
a
s
es for mergetool
.
w
riteToTe
m
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
Aguilar
mergetool
:
add
an
o
ption for writ
i
n
g
to a t
e
mporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
m
ergetool: use more conservative temporary
filen
a
mes
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
test-lib-functions: adjust style to mat
c
h CodingGui
d
e
l
ines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
t761
0
-me
r
getool: use test_conf
i
g
to isola
t
e
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
v
id Aguil
a
r
mergeto
o
ls/mel
d
:
ma
k
e us
a
ge of
`
--
o
ut
p
ut`
c
o
nfigurable
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebas
t
i
a
n Schuberth
contacts
:
add a M
a
kefi
l
e
to generate docs and install
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
S
e
ba
s
t
ian Sch
u
berth
subtree
:
add an instal
l
-html
t
arge
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
dif
f
too
l
: don'
t
assume tha
t
defaul
t
s
h
is
s
ane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
mer
g
e
t
ool: don't req
u
ire a w
o
rk tree for
-
-
t
ool-he
l
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
i
t-sh-setup: move GIT
_
D
I
R in
i
tia
l
ization into
a
f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
mergetool: use more c
o
nservativ
e
temporar
y
filenames
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
test-lib-functions:
adjust style to ma
t
c
h Co
d
ingGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
610-mergetool:
prefe
r
test_config
o
ver git co
n
fig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d
A
guilar
t7610-mergetool:
a
dd missing && and
r
emove
c
o
mmented
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergeto
o
l
: use tabs instead of a mix of ta
b
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref_transact
i
on_
c
omm
i
t: bail out on failure to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
lockfile:
r
emo
v
e
unable_to_loc
k
_error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
N
ieder
ref
s
.
c: do not permit err == NULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
remote
r
m
/
p
ru
n
e:
p
r
int a mes
s
a
g
e
w
h
en writing
p
acked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
for-e
a
ch-ref: skip
and war
n
about b
r
oken ref
na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
r
efs
.
c:
a
l
l
ow l
i
stin
g
and delet
i
ng badly na
m
e
d
re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahl
b
erg
test: put tests for handlin
g
o
f
bad ref
name
s
in one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nied
e
r
p
acked-ref cache: forbid dot-components in refnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
branch -
d
: simp
l
i
fy by u
s
in
g
R
E
SOLVE_REF_READ
I
N
G
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
N
ieder
branch -
d
: avoid repeated
s
ymref r
e
solution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Hamano
reflo
g
t
est
:
test
i
nteracti
o
n with detached H
E
AD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sa
h
lberg
r
efs
.
c: change resol
v
e_ref_unsafe reading ar
g
ume
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlber
g
refs
.
c:
make
write_ref_sha1 stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
n
ie Sahl
b
erg
fetch
.
c: change s_update
_
ref to
u
se a re
f
t
r
ansaction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
S
a
hlbe
r
g
r
efs
.
c: ref_
t
ransaction
_
commit: distinguish na
m
e
c
o
nflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlberg
refs
.
c: pas
s
a list of names to skip to is_
r
efname_availabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c
: c
a
l
l lo
c
k_ref
_
sha1
_
basic direct
l
y from c
o
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
berg
r
efs
.
c
: refuse to
l
ock badly nam
e
d refs in lock_ref_sha1
_
b
a
sic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
r
e
name_re
f
: don'
t
a
s
k
r
ead_ref_f
u
l
l w
h
er
e
the re
f
came
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
refs
.
c: pass th
e
ref
l
og mes
s
a
ge to
_
c
re
a
te/delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie
S
a
h
lbe
r
g
refs
.
c: add an
err ar
g
ument to de
l
ete_ref_loo
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahlbe
r
g
wrap
p
er
.
c: add a new function unlink_or_msg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sa
h
lberg
refs
.
c: lock_ref_sha1_ba
s
ic is use
d
fo
r
all refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
wrapper
.
c: r
e
move/unlink_or_war
n
: simplify, t
r
eat
ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nie
d
er
mv
test: recreate
m
od/ dire
c
tor
y
i
n
stead of relying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Joh
n
Szakmeister
c
omp
l
etio
n
: silenc
e
"fa
t
al
:
Not a
g
it reposi
t
o
ry" error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
c
olor_pa
r
se: d
o
n
o
t mention variab
l
e
n
ame in e
r
r
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan
N
ied
e
r
pas
s
c
onfig slo
t
s
as pointers inst
e
ad o
f
offsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ha
m
ano
Update
draft release note
s
to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio
C Haman
o
Merge branch 'bc/asciidoc-pretty-formats-
f
ix
'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C H
a
m
a
n
o
Merge branc
h
'rs/
p
lug-leak-in-bundle'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branc
h
'
r
s/
m
ore
-
uses-of-skip-prefix'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio
C
H
ama
n
o
Merge branch 'r
s
/mailsplit'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
amano
Mer
g
e branc
h
'
r
s
/sha1-a
r
ray-test'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
Me
r
ge branch 'mh/loc
k
file-st
d
io'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Merge branch
'mh
/
loc
k
file'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Merg
e
b
r
a
nch 'sk/tag-c
o
nta
i
n
s-wo-recur
s
i
o
n'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rg
e
b
r
anch
'
da
/
c
ompleti
o
n
-
show-si
g
nat
u
re'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ha
m
ano
Me
r
ge b
r
anch
'
rs/daemon-fi
x
es'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Haman
o
Merge
b
ranch 'dt/c
a
che-
t
ree-rep
a
i
r'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'so/reb
a
se-doc-fork-
p
oint'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C
Hamano
M
erge branch 'da/include-compat-util-first-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
test-l
i
b
.
s
h
: supp
o
rt -x
o
ption fo
r
shell-tra
c
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Junio C Hamano
t1308: fix broken h
e
re
d
ocume
n
t in test
s
cript
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Cou
d
er
Docu
m
entation: add
d
ocumenta
t
ion fo
r
'
git
i
nterpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coud
e
r
trailer: add t
e
sts for
c
o
mmands
in config file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coud
e
r
trailer: execute command from 'trailer
.
<name>
.
comma
n
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
tian C
o
uder
trail
e
r: add tes
t
s
for "g
i
t interpret-trailers"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trai
l
er:
add interp
r
et-tra
i
l
ers comm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Co
u
der
tra
i
ler: put a
l
l
t
he processing togeth
e
r and print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Couder
t
railer:
parse trailer
s
fro
m
file or stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next