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 'po/doc-status-markup'
2014-10-24
Junio C Ham
a
no
Merge branc
h
'po/doc-statu
s
-markup'
commit
|
commitdiff
|
tree
2014-10-24
Junio C H
a
mano
Mer
g
e
b
r
anch 'jk/pack-obje
c
ts-no-bitmap-when-splittin
g
'
commit
|
commitdiff
|
tree
2014-10-21
Junio C H
a
mano
U
p
date draft release not
e
s
to
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
J
u
ni
o
C
Hamano
Merge branch 'js/completion-hide-not-a-repo'
commit
|
commitdiff
|
tree
2014-10-21
Junio C
H
amano
Merge branch 'da/
m
ergetool-meld'
commit
|
commitdiff
|
tree
2014-10-21
J
uni
o
C Hamano
M
e
rge b
r
anch
'
da/mergetool
-
temporary
-
d
i
re
c
t
o
ry'
commit
|
commitdiff
|
tree
2014-10-21
Juni
o
C Hamano
Merge branch 'da/mergetool
-
tool-help'
commit
|
commitdiff
|
tree
2014-10-21
Junio C
H
amano
Merge branch 'da/me
r
g
e
tool-temporary-filename'
commit
|
commitdiff
|
tree
2014-10-21
Junio
C
Hamano
Merge b
r
anch 'da/mergetool
-
tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge b
r
anch 'rs/ref-transaction'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Haman
o
Update d
r
a
f
t
r
elease notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
Merge branch '
c
c/interpret-tra
i
l
e
r
s'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
er
g
e branch 'rm/g
i
tweb-st
a
rt-f
o
r
m
'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hama
n
o
Me
r
ge branch 'ss/cont
r
ib-subtre
e
-
c
ont
a
c
t
s'
commit
|
commitdiff
|
tree
2014-10-20
Junio C H
a
mano
Me
r
ge branch 'jn/
p
ar
s
e-config-slot'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
Merge branch 'rs/rece
i
ve-pack-argv
-
l
eak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
a
n
o
M
e
r
ge branch
't
a
/c
o
nfig-set'
commit
|
commitdiff
|
tree
2014-10-20
J
u
n
i
o C Hamano
Merge b
r
anch 'jk
/
tes
t
-shell-trac
e
'
commit
|
commitdiff
|
tree
2014-10-20
J
u
n
i
o
C Hamano
Merge branc
h
'bc/ascii
d
o
c
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
R
e
vert "archive: honor tar
.
umask even for pax headers"
commit
|
commitdiff
|
tree
2014-10-20
P
h
ilip
Oakl
e
y
doc: fix 'git status --he
l
p' charac
t
er qu
o
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
pack-objects: tur
n
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 Hamano
Merge branch 'jc/completion-n
o
-chdir'
commit
|
commitdiff
|
tree
2014-10-16
J
u
nio C Hamano
M
e
rge branch 'bw/trace-no
-
i
nline
-
ge
t
nanotime'
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
Hamano
M
e
rg
e
b
r
anch 'po/everyday-doc'
commit
|
commitdiff
|
tree
2014-10-16
Roland Mas
gitweb:
u
s
e s
t
art_form, not st
a
r
t
for
m
t
h
at was re
m
oved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
t7610-m
e
rget
o
ol
:
add test cases
for mergetool
.
writeToTemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguila
r
mergetool: add an opti
o
n for w
r
iting to a
temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
me
r
getool: use more
c
onserv
a
tive tem
p
orary filenames
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
te
s
t-lib-func
t
i
ons:
a
djust style
t
o
match Codin
g
Guidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid Aguilar
t7610-merge
t
ool: use
t
e
st_co
n
f
i
g
t
o
isolate tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id
A
g
u
ilar
me
r
geto
o
ls/me
l
d
:
make usage 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
Sc
h
uberth
con
t
acts:
a
dd a Mak
e
file
t
o generat
e
d
o
c
s and install
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schu
b
ert
h
subtree: add
a
n install-
h
tml target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ch
a
rles Bailey
diffto
o
l: don
'
t assume that default sh
i
s sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
les B
a
iley
mergetool: don't requi
r
e a work
tree for
--tool
-
help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
g
it-sh-setup: m
o
ve GIT_DIR initialization into a fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
merget
o
ol:
use mo
r
e
conservative temporary
filenames
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-functio
n
s
:
adj
u
st style to match Codi
n
gG
u
idelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610
-
mergetool: prefer
t
est_config over git
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t761
0
-merge
t
ool
:
add missing && and remove
comm
e
nted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David
Ag
u
ilar
t7610-mergetool: use
ta
b
s instea
d
of a
mix of
t
abs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
r
e
f_transaction_commit: bail out on fa
i
lure to re
m
ove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jona
t
h
an
Niede
r
lockfile: re
m
ove unable_to_
l
ock_error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Ni
e
der
refs
.
c:
d
o not
permi
t
e
rr == NUL
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlb
e
rg
remote rm/
p
rune:
p
rin
t
a message when writin
g
pa
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlber
g
for-each-ref: skip and warn about bro
k
en ref names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie
S
a
hlb
e
rg
r
e
f
s
.
c: al
l
ow listing
a
n
d delet
i
ng badly na
m
ed refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlberg
tes
t
: put
tests for
h
an
d
lin
g
of ba
d
ref names in
o
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
packed-ref cache: fo
r
bid dot-components in
refnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahl
b
er
g
branch -d: simplify by u
s
i
n
g RES
O
LVE_REF
_
READ
I
NG
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jona
t
han Nieder
bran
c
h -
d
: a
v
oi
d
r
e
pe
a
ted symref resolution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
u
nio C
Hamano
r
efl
o
g tes
t
: test intera
c
tion with de
t
ach
e
d H
E
AD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
h
lberg
refs
.
c: chang
e
resolv
e
_ref_unsa
f
e
r
e
adin
g
a
r
gument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
ref
s
.
c: mak
e
write_
r
ef_
s
ha1 s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlberg
f
e
t
ch
.
c:
change
s_update
_
re
f
to use a r
e
f transaction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie S
a
hlberg
refs
.
c
:
ref_transaction_commit: distinguish nam
e
co
n
flicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie Sahlbe
r
g
refs
.
c
:
pass a list of names to ski
p
t
o i
s
_refname_avail
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahl
b
e
rg
refs
.
c: cal
l
lock_r
e
f_sh
a
1_ba
s
ic directly
f
rom commi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
refs
.
c:
r
efu
s
e to loc
k
badly named refs in lo
c
k_ref_sha1_basi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
rename_ref
:
don't ask rea
d
_ref_fu
l
l
w
h
e
re the ref cam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
re
f
s
.
c
: pass the ref log
message to _create/delet
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlber
g
refs
.
c: ad
d
an err argument
to delete_ref_loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlbe
r
g
w
rapper
.
c
:
add a
n
ew funct
i
on u
n
link_or_msg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie Sahlbe
r
g
refs
.
c: lock_re
f
_sha
1
_basic
i
s used for all refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
a
hlberg
wrapper
.
c:
r
emove/unlink_or_warn
:
simplify, tre
a
t ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
N
ied
e
r
m
v
test: recrea
t
e m
o
d
/ directory instead of relying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
John Szakmeis
t
er
completi
o
n: silence "fatal: Not a
g
i
t
repository" error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jef
f
Ki
n
g
color_p
a
rs
e
:
d
o not men
t
ion variable name in error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan
N
ieder
pass conf
i
g slot
s
as po
i
nters i
n
ste
a
d
o
f offsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Update d
r
aft release notes t
o
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
u
ni
o
C
H
ama
n
o
M
e
rge
br
a
nch 'bc/asciidoc-pretty-
f
ormats-fix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'rs/plug-leak
-
i
n-bundle'
commit
|
commitdiff
|
tree
2014-10-14
J
unio
C
Hamano
M
e
rge branch 'rs/more-uses-of-skip-prefix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge br
a
nch 'rs/mailsplit'
commit
|
commitdiff
|
tree
2014-10-14
J
u
ni
o
C Hamano
Merge b
r
anch 'rs/s
h
a1
-
array-test'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Mer
g
e branch 'mh/lockfile-std
i
o'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merg
e
branch '
m
h/lockf
i
le'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Hama
n
o
Merge branch '
s
k/tag-contains-wo-recursion'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C Hama
n
o
M
e
rg
e
branch 'da/c
o
mpletion
-
show
-
signature'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch
'rs
/
d
aemon-fixes
'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C Hamano
Merge
b
ranch 'dt/cache-
t
ree-repair'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Ham
a
no
Merge branch 'so
/
rebase-doc-
f
ork-poi
n
t'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge bra
n
c
h
'da/
i
n
c
l
u
d
e
-co
m
p
at-util-first-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
test-lib
.
s
h: support -x
o
p
t
ion for sh
e
ll-tracing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Junio C Hamano
t1308: fix broken here
docume
n
t in tes
t
script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Documentation: add docu
m
entation for 'g
i
t
i
nterpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Couder
t
railer: add tests
f
or commands in con
f
ig file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
r
i
stian
C
ouder
traile
r
: execute co
m
ma
n
d fr
o
m 'trailer
.
<nam
e
>
.
comma
n
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian C
o
uder
trailer: a
d
d tests for "git
interpret-traile
r
s"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
ti
a
n Co
u
der
tr
a
iler: add inter
p
ret-
t
r
a
ilers command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Couder
trailer: put all
the pro
c
ess
i
ng together and print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer:
pa
r
s
e trailers from file o
r
stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: process comman
d
line tr
a
iler arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian Couder
trailer: read and process
config information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Cou
d
er
trailer: process tra
i
lers
from in
p
ut messa
g
e an
d
arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hri
s
tian Couder
t
railer: add
d
a
ta s
t
ructures and basic function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
b
r
ia
n
m
.
carlson
D
ocumentation: fix
m
ismatc
h
ed delimit
e
rs i
n
git-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
carl
s
on
D
ocumentation: adjust do
c
u
men
t
title underlining
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
René Scharfe
re
c
eive-pac
k
: plug
minor memo
r
y l
e
ak in
u
n
pack()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next