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 'jk/pack-objects-no-bitmap-when-splitting'
2014-10-24
Junio C Hamano
Merge
branch 'jk/pack-objects-no-bitmap-when
-
splitting'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Upd
a
te draft
r
elease notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Junio
C H
a
man
o
Merge
branch 'js/completion-
h
ide
-
n
o
t
-a-re
p
o'
commit
|
commitdiff
|
tree
2014-10-21
J
u
nio
C
H
a
ma
n
o
Me
r
ge b
r
anch 'da/m
e
rgetool-meld'
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
io C Ham
a
n
o
Merge bra
n
ch 'da/mergetool-t
e
mp
o
rary-directory'
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
io C Hamano
Merge bra
n
ch 'da/me
r
getool
-
to
o
l-help'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge branch 'da
/
m
erge
t
ool-temporary-filename'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge branc
h
'da/mergetool-tests
'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Ha
m
a
n
o
M
e
rge
b
r
anch 'rs/ref-transacti
o
n'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ham
a
no
Update draft rele
a
se n
o
t
e
s to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 'cc/interpret-tra
i
l
e
rs'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C Hamano
Me
r
ge branch 'rm/gitwe
b
-start-form'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio
C Ham
a
no
Merge br
a
n
c
h
'
ss/contrib-subtree
-
con
t
acts'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Ham
a
no
M
e
r
g
e bran
c
h
'jn/p
a
rs
e
-c
o
nfig
-
slot'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C Hamano
Merge
branch 'rs/receive-pa
c
k-arg
v
-leak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 't
a
/
c
onfi
g
-
set'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C Hama
n
o
Merg
e
branch '
j
k
/
test-shell-
t
race'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C Ha
m
ano
Merge
b
ranch 'bc/asciido
c
'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o
C
Haman
o
Reve
r
t
"ar
c
hive: hono
r
tar
.
umask
e
ven f
o
r
pax headers"
commit
|
commitdiff
|
tree
2014-10-19
J
e
ff King
pack
-
o
b
jects: turn o
f
f
b
i
t
m
aps when
w
e
split packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge branch 'jc/completion-no-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Ju
n
i
o
C Hamano
Merg
e
b
ranc
h
'
b
w/trace-no-i
n
line-
g
etnan
o
tim
e
'
commit
|
commitdiff
|
tree
2014-10-16
Junio C
H
aman
o
Merg
e
bra
n
ch 'po/everyday-d
o
c
'
commit
|
commitdiff
|
tree
2014-10-16
Roland Mas
gitwe
b
: us
e
start_fo
r
m, not startform th
a
t
w
as removed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7610-merg
e
tool: add test cases fo
r
merge
t
ool
.
writeToTemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
A
gu
i
lar
mergetool: add an opt
i
on
for writing to a
t
emporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
mergetool:
use mor
e
conservative te
m
po
r
ar
y
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 Aguilar
test-lib-functions: adjust styl
e
to match CodingGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
t7610-m
e
rget
o
ol
:
use
t
e
st_config to isolate tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d Agu
i
lar
mergetools/meld: make usag
e
of `--output` configurabl
e
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schuberth
cont
a
cts: add a Ma
k
efile to generate docs and instal
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian
Schuberth
s
ubtree: a
d
d an
i
n
s
tall-html tar
g
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
C
h
a
rles
B
ailey
difftool
:
don't
assum
e
that de
f
aul
t
sh is
sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Ba
i
ley
mergetool: don't requir
e
a
w
o
rk tree
fo
r
-
-
tool-he
l
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Agu
i
la
r
git-sh
-
s
e
tup: move
G
IT_
D
IR init
i
aliza
t
ion
i
nto a function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
i
d
Aguila
r
merg
e
t
oo
l
:
use
m
or
e
con
s
ervative temp
o
rary fil
e
names
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
test-lib-functions:
a
djust style to m
a
tch C
o
dingGuide
l
in
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-m
e
rge
t
ool
:
prefer test_config
o
ver g
i
t config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Ag
u
ilar
t7610-mergeto
o
l:
a
dd m
i
ss
i
ng && and remove com
m
ented
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Aguilar
t7610-merge
t
ool: u
s
e
tabs instead of a mix of tabs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
o
nathan Nieder
r
e
f_
t
ransaction_commit: bail o
u
t on fai
l
u
r
e
to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonat
h
an Nieder
lockfi
l
e: remove unable_to
_
loc
k
_err
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jo
n
athan Nieder
refs
.
c
: do not permit err == NULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
remote r
m
/prune:
print a message
w
h
e
n writin
g
p
a
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie
Sahlberg
for-each-ref: skip and warn about brok
e
n ref names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahlb
e
rg
r
e
f
s
.
c: a
l
l
o
w listi
n
g
a
nd
deleting badly named re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlb
e
rg
test: put tests for hand
l
ing of bad re
f
names in
o
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jona
t
ha
n
Nieder
pa
c
ked-ref
c
ache: forbid dot-componen
t
s
in
r
e
f
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
branch -d:
s
im
p
lify by using
RE
S
OLVE_REF_REA
D
ING
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
o
na
t
han Nied
e
r
branch -d: avoid
repeated symref resolut
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Hamano
reflog t
e
st: test
i
nteract
i
o
n
w
ith detached HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
b
erg
r
efs
.
c: chan
g
e reso
l
ve_ref_uns
a
f
e r
e
ading argum
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlber
g
r
e
fs
.
c
: m
a
ke wr
i
t
e
_ref_sha1
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
f
etch
.
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
Ron
n
ie Sah
l
berg
refs
.
c:
ref_transacti
o
n
_
commit:
d
ist
i
nguish name
c
onflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: p
a
s
s a
list of nam
e
s to ski
p
to is_refname_available
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
l
b
e
r
g
r
e
fs
.
c: call lo
c
k
_ref_sha1_b
a
sic d
i
rectly fr
o
m commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie Sahl
b
erg
refs
.
c: refus
e
to lo
c
k badly nam
e
d ref
s
in lock_ref_sha1_basic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
renam
e
_ref: don't
ask
r
ead_
r
ef_full
w
her
e
the ref came
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
b
erg
r
efs
.
c:
p
a
s
s the ref log
message to _
c
r
eate/delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
ref
s
.
c: add an err argument to delete_ref_l
o
ose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
wrapper
.
c: add a new
function unlink_or_msg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lber
g
refs
.
c:
l
ock_ref_sha1_basic
is used fo
r
all refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
ni
e
Sahlbe
r
g
wrappe
r
.
c: remove/unlin
k
_or_warn: simplif
y
, treat
E
NOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
mv t
e
st
:
recreate
m
od/ direct
o
ry instead of relying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
John Sz
a
kmeister
complet
i
on: silence "fatal: Not a git r
e
pository" err
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jeff Kin
g
c
olor_
p
a
rse
:
do no
t
mention
v
ariable name in
e
r
ror
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonath
a
n
N
ieder
p
a
ss config slot
s
as pointers
i
nste
a
d
o
f off
s
et
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
amano
Update draft r
e
lease notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Ha
m
a
n
o
Me
r
g
e
branch 'b
c
/ascii
d
oc-prett
y
-form
a
ts-fix
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hama
n
o
Mer
g
e
br
a
nc
h
'rs/plug
-
leak-in-bundle'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
ma
n
o
Merge
b
ranch 'rs/more-uses-of-skip-prefix'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Hamano
Merge b
r
anch 'rs
/
m
a
ilsp
l
it'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hamano
Mer
g
e bra
n
ch 'r
s
/s
h
a1-ar
r
ay-tes
t
'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
H
amano
Merge branch '
m
h/lockfile-stdio
'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
H
a
mano
M
e
rg
e
branch '
m
h/lockf
i
le'
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C
Ham
a
n
o
Merge br
a
n
ch 's
k
/tag-contains-
w
o-recursion'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'da
/
completion-sh
o
w-signature'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hamano
Mer
g
e branch 'rs/da
e
mo
n
-
f
ixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hama
n
o
Merge br
a
n
c
h 'dt
/
cache-tr
e
e-repair'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
mano
Merge br
a
nch 'so
/
rebase-do
c
-fork-poi
n
t
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'da/include-
c
ompat-util-first-i
n
-c'
commit
|
commitdiff
|
tree
2014-10-13
Je
f
f King
test
-
l
ib
.
sh: suppor
t
-x option for shell
-
tracing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Juni
o
C Hamano
t
1308: fi
x
b
r
o
ken
h
er
e
d
o
cument in t
e
s
t script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
Document
a
tion: add docume
n
tation f
o
r 'git int
e
rpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coude
r
trailer
:
a
dd tests for comma
n
ds in config fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
s
t
ian C
o
uder
trai
l
er
:
execute comman
d
from
'trailer
.
<name>
.
command'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hr
i
sti
a
n
Couder
tr
a
iler: add tests for
"git interpret-trailers"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: ad
d
i
nterpret-tr
a
ilers com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
risti
a
n Couder
trailer: pu
t
a
l
l the pro
c
essing t
o
gether and pri
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Cou
d
er
trailer: parse
t
railer
s
from file or st
d
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an C
o
uder
tra
i
ler: p
r
oc
e
ss
comm
a
n
d
line trail
e
r argu
m
e
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
sti
a
n Cou
d
er
t
railer: read and process c
o
nfig information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian C
o
u
der
trailer: process trailers from input
m
essage and
argu
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
s
t
i
an Coud
e
r
trailer: add data st
r
uctures and basic functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
bri
a
n
m
.
carlson
Document
a
tion: fix mismat
c
hed del
i
mi
t
ers
in git-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
car
l
so
n
D
o
cumentat
i
on
:
a
dju
s
t document title under
l
ining
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Re
n
é
Sc
h
arfe
receive-pac
k
: plug mino
r
memory
l
eak
i
n u
n
pack()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
J
e
f
f
King
t
5304: use helper to report failure of "te
s
t foo =
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t530
4
: use t
e
st_pat
h
_is_* i
n
s
tea
d
of "test -f
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next