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/mergetool-tool-help'
2014-10-21
Junio C H
a
m
ano
Merge
branch 'da
/
mer
g
eto
o
l-
t
ool-help'
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
io
C Hamano
Merg
e
br
a
nch 'da/m
e
rget
o
ol-temporary
-
f
i
lename'
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
io C
H
a
m
ano
Merge b
r
anch 'da/mergetool
-
tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
M
erge branch 'rs/ref-tra
n
s
a
c
tion'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hamano
Update d
r
a
f
t re
l
ease no
t
e
s
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
J
u
ni
o
C Hamano
Merge branc
h
'cc/inter
p
ret-trailers'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o
C
Hamano
M
erge
b
ranch 'rm/gitweb-start-form
'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C Hamano
Merge branch 'ss/co
n
tri
b
-
subtree
-
co
n
t
acts'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ham
a
no
Merge bran
c
h
'jn/parse-c
o
nf
i
g-slot'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hamano
Merge bra
n
c
h
'
r
s/receive-
p
ack-argv
-
l
e
ak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
ano
Mer
g
e br
a
nch 'ta/config-s
e
t'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
an
o
Merge branch
'
jk/tes
t
-shell-trace'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Haman
o
Merg
e
branch 'bc/asciidoc
'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io C Hamano
Re
v
ert "archive:
honor
t
ar
.
umask even
f
or pax headers"
commit
|
commitdiff
|
tree
2014-10-16
Junio C
H
amano
Merge branch
'
jc/completio
n
-no-ch
d
ir'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge b
r
anch 'b
w
/trace-no-
i
n
l
ine-getnanotime'
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
Hamano
Merge br
a
nc
h
'po/everyday
-
d
o
c'
commit
|
commitdiff
|
tree
2014-10-16
Roland M
a
s
gitweb:
use sta
r
t_form, not st
a
r
t
f
orm that w
a
s remov
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Agui
l
ar
mer
g
et
o
ol: use more conserva
t
ive tempo
r
ary file
n
ames
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-
l
ib-functio
n
s:
ad
j
u
st s
t
y
l
e to match
CodingGu
i
delines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
guilar
t7
6
10
-
m
ergetool
:
use test_
c
onfig
to isolate tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Se
b
astian Schu
b
erth
contact
s
: add
a
Makefile to generate docs a
n
d insta
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Sch
u
berth
su
b
tree:
add an install-html target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
les Bailey
diffto
o
l: don't assume
that default sh is
s
ane
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bail
e
y
mergetool:
don't requi
r
e a work tree
for --to
o
l-help
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
git-
s
h-setup: m
o
ve GIT_DI
R
i
nitializa
t
i
o
n into a fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
mer
g
etool: use more c
o
nservative t
e
mpo
r
ar
y
file
n
ames
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t
e
st
-
lib-funct
i
ons:
a
djust style to match Coding
G
ui
d
elines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Agu
i
lar
t76
1
0-m
e
r
geto
o
l:
prefer test_config over
git confi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7
6
10
-
mergetoo
l
: add miss
i
ng && and
r
emove commented
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guila
r
t
7
610-merg
e
tool: use tabs instead
of a mix
o
f
tab
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
N
ie
d
er
ref_
t
rans
a
ction_c
o
mmi
t
: bail
o
ut on f
a
il
u
re to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
l
ockf
i
le:
r
emove unable_
t
o_
l
o
ck_error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
N
ieder
refs
.
c: do not permit err
=
= NU
L
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlb
e
r
g
r
e
mote rm/prune: print a messa
g
e when w
r
iting packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
n
ie Sahlberg
for-each-re
f
:
s
kip an
d
w
arn about broken ref na
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
refs
.
c: a
l
low listing and d
e
leting badly na
m
ed refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
h
l
b
erg
test: put tests for h
a
ndlin
g
of b
a
d r
e
f names
in one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jon
a
than Nieder
packed-ref cache: forbi
d
dot-components in refn
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
b
ranch
-
d: simplify by
u
s
in
g
RESOLV
E
_
R
EF_READING
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
br
a
nch -d: av
o
id re
p
eated
s
y
m
r
ef resolu
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Hamano
reflog test
:
test
i
n
te
r
action wi
t
h detach
e
d
H
EA
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
be
r
g
refs
.
c
: ch
a
nge reso
l
v
e
_
r
ef_unsafe reading
a
rgument
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahl
b
erg
refs
.
c: make wr
i
te_ref_sh
a
1 static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
i
e
S
a
hlberg
fe
t
c
h
.
c: change s_
u
pdate_ref
to use a ref t
r
an
s
action
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlber
g
refs
.
c:
ref_transaction_
c
ommi
t
:
dist
i
nguish na
m
e
c
onflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahlberg
refs
.
c: pa
s
s a list of
n
ames
to
skip to i
s
_
r
e
f
name_available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie S
a
hlberg
r
e
f
s
.
c: call loc
k
_
r
ef_sha
1
_basic direc
t
ly
from comm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlb
e
rg
r
e
f
s
.
c: refu
s
e t
o
lock badly named ref
s
in lock_ref_sh
a
1_basic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
rename_ref: don't ask read_ref_full where
t
he ref came
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
i
e Sahlb
e
rg
refs
.
c
: pass
t
he
ref log message to _create/delete
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: add an
e
rr argument to d
e
let
e
_ref_loose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlbe
r
g
wra
p
pe
r
.
c: add a ne
w
f
u
nct
i
on unlink_or_msg
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlb
e
r
g
re
f
s
.
c: lock_ref_sha1_basic is use
d
for a
l
l refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
l
b
erg
w
r
apper
.
c: r
e
m
ove/u
n
lin
k
_or
_
warn: simplify, tre
a
t
ENOENT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan N
i
e
d
er
mv
t
es
t
: recrea
t
e mod/ dire
c
tory ins
t
ead of r
e
lying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Je
f
f King
color_parse:
d
o not
mention variable
name in error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jon
a
than Nieder
pass config slots as pointers inst
e
ad o
f
o
ffsets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio
C Hamano
Up
d
ate draft rel
e
ase notes
t
o
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
H
am
a
no
M
erge branch 'bc/as
c
iidoc-pretty-formats-fix'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hamano
Merge bra
n
ch 'rs/plu
g
-leak
-
in-bun
d
le'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hama
n
o
Merge
branch 'rs/more-uses-of-skip-pref
i
x'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ham
a
n
o
M
erge branch 'rs/mai
l
split'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Hama
n
o
Merge branch 'rs/sha1
-
array-test'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
a
man
o
Merge branch 'mh/lockfile-stdio
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ham
a
no
M
erge branch 'mh
/
lockfile'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Haman
o
Merge
b
ran
c
h 'sk/tag-
c
ontains-wo
-
re
c
ursion'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C
H
amano
M
e
rg
e
bra
n
ch 'da/comp
l
e
t
ion-show
-
signat
u
re'
commit
|
commitdiff
|
tree
2014-10-14
J
u
n
i
o
C Haman
o
Merge branch 'rs/daemo
n
-
fixes'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hama
n
o
Merg
e
branch 'dt
/
cache-tree-repair'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hama
n
o
M
e
rge branc
h
'so/rebase-doc-fo
r
k-p
o
int'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge branch 'da/include-co
m
pat-util-first-in-
c
'
commit
|
commitdiff
|
tree
2014-10-13
Jeff
K
ing
t
e
st-lib
.
sh: support -x
o
p
tion f
o
r shell-tracin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jun
i
o
C Hama
n
o
t1308: fi
x
broken he
r
e document in
test script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Docume
n
tation: add
d
ocumentation for 'git interpret
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Couder
trailer: add tests f
o
r c
o
mman
d
s in
confi
g
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
tian
Couder
t
r
a
i
l
er
:
execute comman
d
from 'trailer
.
<
nam
e
>
.
command'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
ouder
t
r
ailer: a
d
d tests for "git in
t
erpret-trailers"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
trailer: add int
e
rpret-trailers command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
t
r
ai
l
er:
put
all th
e
p
r
o
c
e
s
sin
g
tog
e
ther
a
nd print
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
d
er
t
r
ailer: pars
e
trailers
from file or st
d
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trail
e
r: process comma
n
d line tra
i
l
er arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Couder
t
r
aile
r
: read an
d
pro
c
ess config informatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
rist
i
an Couder
t
railer: process trailers
from
i
n
put
message and
ar
g
uments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
der
trailer: add data st
r
u
c
tures and basic f
u
nc
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
b
rian m
.
carlson
Do
c
umen
t
ation: fix
m
ismatc
h
ed delimi
t
ers in g
i
t
-imap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
c
arlson
Doc
u
me
n
tation: adjust docu
m
ent title
underlining
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
René Scharfe
receive-pac
k
: plug minor memory leak in
unpack()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jeff Kin
g
t5304:
u
se
h
elper to re
p
or
t
failure o
f
"te
s
t f
o
o
=
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Je
f
f K
i
ng
t
5304: us
e
te
s
t_path_
i
s_* i
n
stead
o
f "test -f"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
do
c
: add
'
e
very
d
ay' to 'git help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
doc: Makefile regularise OBSOLETE_HTM
L
list
bui
l
ding
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
P
hilip Oakley
do
c
: modern
i
se
every
d
ay
.
txt
wo
r
ding and for
m
at in man
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-09
Junio
C
H
a
mano
comp
l
etion: use "git -C $t
h
er
e
" instea
d
of (cd $there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
brian m
.
c
arlson
D
o
cumenta
t
io
n
: fix
m
isre
n
der
of
pretty
-
formats
in Ascii
d
o
cto
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
J
unio C Hamano
U
pd
a
te draft r
e
le
a
se note
s
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
Juni
o
C Hamano
Merg
e
b
r
anch
'
s
p/stream-clean-filter'
commit
|
commitdiff
|
tree
2014-10-08
Junio C
Hamano
Me
r
ge branch 'b
w
/use-write
-
script-in-
t
ests'
commit
|
commitdiff
|
tree
2014-10-08
Junio C Hamano
Merge b
r
anch '
n
d/archive-pathspec'
commit
|
commitdiff
|
tree
2014-10-08
Junio C Hamano
Merge b
r
anch
'jc/p
u
sh-cert'
commit
|
commitdiff
|
tree
next