repo.or.cz
/
git.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-temporary-directory'
2014-10-21
Junio C Hamano
Merge
branch 'd
a
/m
e
rg
e
tool-t
e
mpo
r
ary-di
r
ectory'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C Ha
m
ano
Merge
b
r
an
c
h 'da/merge
t
ool-
t
ool-help'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge b
r
anch 'da/
m
e
r
getool-temporary-filename'
commit
|
commitdiff
|
tree
2014-10-21
Junio C H
a
mano
Merge branch 'da/mer
g
etool-
t
ests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge branch
'
rs/ref-tra
n
s
action'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
ano
Updat
e
dr
a
ft r
e
leas
e
notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
e
rg
e
branch 'cc/interpre
t
-
t
rai
l
ers'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Mer
g
e
b
ra
n
ch 'rm/g
i
tweb-sta
r
t-fo
r
m'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
a
man
o
Merge br
a
n
ch 'ss/
c
ontrib-subtree
-
contacts'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C
H
amano
Mer
g
e
branch 'j
n
/parse-config-slo
t
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
erge branch 'r
s
/receive-pack-ar
g
v
-leak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Ham
a
no
Merge branc
h
'
t
a
/
c
onfig-set'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C Ha
m
ano
Merg
e
br
a
nch '
j
k/test-shell-trace'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Hamano
M
er
g
e branch '
b
c/asciidoc'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C H
a
mano
Revert "
a
rchive:
ho
n
or tar
.
umask even for
p
a
x head
e
rs"
commit
|
commitdiff
|
tree
2014-10-16
J
unio C Hamano
Merge branch 'jc
/
completion-no-chdi
r
'
commit
|
commitdiff
|
tree
2014-10-16
Junio
C Hamano
Merge
b
ranch 'bw/trace-no-in
l
ine-
g
etnano
t
ime'
commit
|
commitdiff
|
tree
2014-10-16
Jun
i
o C Haman
o
M
e
r
g
e b
r
anch '
p
o/everyday-doc'
commit
|
commitdiff
|
tree
2014-10-16
Roland Mas
gitweb
:
u
s
e
start_form, not startfo
r
m th
a
t was remov
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7
6
10-merget
o
ol: add test ca
s
es for mergetool
.
w
r
iteToT
e
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
me
r
ge
t
ool: a
d
d a
n
option f
o
r writing to a tem
p
orary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agui
l
a
r
m
e
r
getool: use more conser
v
ative 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
Aguilar
tes
t
-lib-f
u
n
ct
i
ons: adjust style to ma
t
ch CodingGuideline
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguil
a
r
t7610-mergetool:
u
se
t
est_config to i
s
o
l
ate tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebast
i
an Schuberth
contac
t
s: a
d
d a
Ma
k
ef
i
le to
generate docs and i
n
stall
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schuber
t
h
s
u
btree:
add
a
n install-html ta
r
get
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles
B
ailey
difftool: don'
t
assume that default s
h
is sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
merge
t
ool: don't require a work
tree fo
r
--tool-help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-sh-set
u
p
: mov
e
GI
T
_
D
IR i
n
i
tialization into a
fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
avid
Aguilar
merg
e
tool:
u
se more conservat
i
v
e temporary
f
ilenames
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
t
e
st-lib-functions: adjust style to match CodingGuidel
i
ne
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
t7610-merg
e
tool: pre
f
e
r
test_config over git
c
on
f
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Aguilar
t
7
6
10-merge
t
ool: add missing && and
rem
o
ve commented
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
610-m
e
r
g
etool
:
use t
a
bs
in
s
tead of a
m
i
x
o
f ta
b
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref_trans
a
ct
i
on_co
m
mit:
b
a
il out on
f
ailure to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonath
a
n Nieder
lockfile: re
m
o
ve unable_to_lo
c
k_err
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
refs
.
c: do not p
e
rmit err
== NU
L
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie S
a
hl
b
erg
remote rm/prune: print a me
s
s
age w
h
en writing
p
acke
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
for-each-ref: skip and w
a
rn
a
b
o
ut broken
r
ef names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: all
o
w
l
isting and
del
e
ting b
a
dl
y
named refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
test:
p
ut tests for
handl
i
ng of bad r
e
f names
i
n one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jon
a
th
a
n Nieder
packe
d
-ref cache: forbid
dot-componen
t
s
in refnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
br
a
n
ch -d: simplify b
y
usi
n
g
RESOLVE_
R
EF_READING
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
bra
n
c
h
-
d: avoid repeated symref re
s
o
l
ution
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Juni
o
C Hamano
reflog test: test interaction 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: chang
e
resolve_ref_unsafe readi
n
g argum
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
efs
.
c: make write_ref_sha1 sta
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
fe
t
c
h
.
c:
change
s_update_re
f
to use
a ref transacti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
nie Sahl
b
erg
refs
.
c: ref_transaction_commit: distingu
i
sh na
m
e co
n
flicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
l
be
r
g
refs
.
c
:
pass a list of n
a
mes to skip to is_r
e
fname_ava
i
l
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: call lock_ref_sha1
_
b
a
sic d
i
r
e
ctly
f
rom
comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nn
i
e Sahlbe
r
g
r
efs
.
c: refuse to lock ba
d
ly name
d
refs i
n
l
ock
_
re
f
_sha1_basic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahl
b
erg
rename_ref: don
'
t ask read_re
f
_
f
u
ll where the ref c
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
refs
.
c: pass the ref log message
to _create/delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sa
h
lberg
r
e
fs
.
c: a
d
d
an er
r
argument to dele
t
e
_
ref_lo
o
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie
Sahlberg
wra
p
per
.
c:
a
dd
a new fu
n
ction
unli
n
k_or_msg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
l
b
erg
r
e
fs
.
c
:
l
o
c
k
_ref_
s
ha1_basic is used for
a
ll r
e
fs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
wrapper
.
c: remove/u
n
link_or
_
warn
:
s
i
mplify, treat ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
onathan Nieder
mv test: rec
r
eate mod/ directory instead of re
l
yin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
e
ff K
i
ng
color_parse: do not mention variable name in error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jo
n
athan Nieder
pass
con
f
ig s
l
ots
as pointers instead of
offsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Ham
a
n
o
Update draft release n
o
t
es to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge branch 'bc/asc
i
idoc-p
r
etty-formats-fix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
m
ano
Merge branch 'rs/p
l
ug-le
a
k
-
in-bun
d
le
'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C
H
amano
Merge br
a
nch
'
rs/more
-
u
s
e
s
-
of-skip-prefi
x
'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C Hamano
Merge bra
n
ch 'rs
/
mailsplit'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
a
ma
n
o
Mer
g
e branch 'r
s
/sha1-ar
r
ay
-
test'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Merge bran
c
h
'mh
/
lockfile-stdio'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io
C
Hamano
Me
r
g
e branch 'mh/lock
f
ile'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Haman
o
Mer
g
e branch 'sk/tag-contains-wo-recur
s
ion'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Merg
e
bran
c
h 'da/
c
ompletion-s
h
ow-signature'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hamano
Merge b
r
anc
h
'rs/daemon-fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
ma
n
o
M
erge b
r
anch 'dt/cache-tree-r
e
pair'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
i
o
C Hamano
M
erge bra
n
ch
'so/rebase-doc-f
o
r
k-point'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
ama
n
o
M
e
rge branch 'd
a
/include-compa
t
-util-first-in
-
c'
commit
|
commitdiff
|
tree
2014-10-13
J
e
f
f King
test-lib
.
s
h
: support -x
o
ption for
shell-tracing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Junio
C
Hamano
t1308:
fix broken here document in
test script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Couder
Documentation: add documentation for 'git in
t
erpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hristia
n
Couder
tra
i
ler: ad
d
t
e
s
ts for commands
i
n
c
onfig file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian
C
o
u
de
r
tr
a
il
e
r
: execute comma
n
d fr
o
m 'trailer
.
<
na
m
e
>
.
co
m
mand'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: ad
d
tests
f
or
"
gi
t
interp
r
et-trailers"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
u
d
e
r
trai
l
er:
add in
t
er
p
ret
-
trailer
s
c
o
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trail
e
r: put al
l
the processing toget
h
er and print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an C
o
uder
trail
e
r: parse trailers from
f
i
le or std
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian
Coude
r
tr
a
iler: p
r
o
c
ess command line trailer arg
u
men
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
ud
e
r
trailer: read
a
nd
process
c
onfig in
f
o
rmat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian Couder
trail
e
r: pr
o
cess t
r
ailer
s
from input message
a
nd arg
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian C
o
uder
t
railer: add data structur
e
s
and basi
c
f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
car
l
s
o
n
Docum
e
ntation
:
f
i
x
misma
t
ched delimiters in git-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
car
l
son
Documentation: adjust documen
t
ti
t
l
e underlin
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Re
n
é
Scharfe
receive-pack: plug minor m
e
mor
y
leak i
n
unpack
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
J
e
ff King
t5304: use helper to report failure of "test foo =
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304: use
test_path_
i
s_*
i
n
s
tea
d
of
"
te
s
t -f"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
doc
:
add 'everyday' to 'git help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakl
e
y
doc: Makefile re
g
ula
r
ise OBS
O
LETE_HTML list building
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
d
o
c
:
mode
r
nise everyda
y
.
txt wo
r
din
g
a
nd format 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
m
ano
comple
t
i
on: use "g
i
t
-C $th
e
r
e
"
i
n
stead
of (
c
d $ther
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
brian
m
.
carlson
Docum
e
ntatio
n
: fix misrender of pret
t
y
-
format
s
i
n
Asciido
c
tor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
Junio C Haman
o
U
p
date draft release no
t
es t
o
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
J
unio C
Ha
m
ano
M
e
rge branch 'sp
/
stream-cl
e
an-filter'
commit
|
commitdiff
|
tree
next