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
M
e
rge branch 'da/
m
ergetool-t
e
mporary-directory
'
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
io C
Ham
a
n
o
M
er
g
e branch
'da/
m
e
r
getool-tool-help'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C Ham
a
no
Merge bra
n
ch 'da/mergetool-
t
e
mporary-f
i
lename'
commit
|
commitdiff
|
tree
2014-10-21
J
unio C Hamano
Merge branch 'da/mergetool-tes
t
s'
commit
|
commitdiff
|
tree
2014-10-21
J
unio C Ha
m
ano
Merge b
r
anch 'rs/
r
ef-transa
c
tion'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hamano
Update draft release
n
o
tes to
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C H
a
m
a
no
Merge branch 'cc/interpret-trailers
'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hamano
Merge branch
'rm/gitweb-start-form'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Ham
a
no
M
erge branch
'
ss/con
t
rib-s
u
btre
e
-co
n
t
a
cts
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
Merge branch 'jn
/
par
s
e-confi
g
-slot'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
M
e
rge br
a
nch 'r
s
/receive-pack
-
arg
v
-leak-f
i
x'
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C
Ham
a
no
M
e
rge branch 'ta/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io
C
Hamano
Merge branch '
j
k
/test-she
l
l-trac
e
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hama
n
o
Merg
e
br
a
nch 'b
c
/
a
sciidoc'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hama
n
o
Rever
t
"ar
c
hiv
e
: hon
o
r
t
ar
.
umask eve
n
for pa
x
heade
r
s
"
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
Hamano
Merg
e
branch 'jc/c
o
m
pletion
-
n
o
-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Ham
a
n
o
Merge
branch 'bw/
t
race-no-i
n
line
-
ge
t
n
anotime'
commit
|
commitdiff
|
tree
2014-10-16
Ju
n
i
o
C
Hamano
M
e
r
ge branch 'po/everyday-d
o
c'
commit
|
commitdiff
|
tree
2014-10-16
Roland Mas
gi
t
web: use start_form, not startform that was removed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Da
v
id Aguilar
t7610-mergetool: add test cases
f
or merg
e
tool
.
writeT
o
Temp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
me
r
getool: ad
d
an option f
o
r writing to a t
e
mpor
a
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguil
a
r
mergetool: use more c
o
nservative 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
test-lib-functi
o
n
s: adjust
style to matc
h
CodingGuidel
i
nes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-m
e
rgetool: use
test_config to
i
solate tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schuberth
contacts: add a Makefile
t
o
generate docs a
n
d install
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schuberth
subtree:
add an ins
t
all-html target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ch
a
rles Bailey
d
ifftool: don't ass
u
m
e
that def
a
ult sh is sane
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arles
B
ail
e
y
merg
e
t
o
ol: don't r
e
quire a work tree for --tool-he
l
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Aguilar
git-
s
h-setup: move
G
IT_DIR initial
i
zati
o
n
i
n
to a function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
a
vid Aguilar
me
r
get
o
ol:
use more conservative temporary 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
Davi
d
Aguilar
te
s
t
-
lib-functions: a
d
j
ust sty
l
e to match CodingGui
d
elines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Agu
i
lar
t
7
610
-
m
ergetool:
prefer test_config over git config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t
7
6
10-
m
ergetool: add missing && and r
e
mo
v
e commente
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-me
r
getool:
u
se tabs in
s
t
ead
of a mix of tabs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nied
e
r
ref
_
t
ransact
i
on_co
m
mit
:
bail out
on fa
i
lure to remov
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
lockfile: remove unable_to_lock_error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
refs
.
c: do not permi
t
err
== NULL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlberg
re
m
ote rm/prune: print a message w
h
e
n
writing packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
berg
fo
r
-ea
c
h-r
e
f: sk
i
p and
w
arn about brok
e
n ref
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie S
a
hlberg
re
f
s
.
c:
allow
l
isting and delet
i
ng badl
y
n
a
med
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 hand
l
ing of b
a
d ref names
i
n one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
J
onat
h
an Nieder
pac
k
ed
-
ref c
a
che:
forbid d
o
t-co
m
ponents i
n
r
efnames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
br
a
n
c
h
-d: simplify by using RESOLVE
_
R
EF_READING
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
J
o
n
a
than Nieder
br
a
nch
-d: avoid repeate
d
symref res
o
lution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jun
i
o
C H
a
mano
ref
l
og test:
test interaction with det
a
ched HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: change re
s
o
l
ve_
r
ef_u
n
safe reading argument
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c:
m
a
ke write_ref_sha1 static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
fetch
.
c
: change
s_update_re
f
to us
e
a ref transaction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
refs
.
c: ref_transact
i
o
n_commi
t
: dist
i
ngu
i
sh
n
ame conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: pass a
list of na
m
es to
sk
i
p
to
i
s_
r
efname
_
av
a
ilabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
n
i
e Sahlbe
r
g
refs
.
c
: call lock_r
e
f_sha1_basic di
r
e
ctly from
commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
e
fs
.
c: re
f
use to lock bad
l
y named refs in lo
c
k_ref_
s
ha1_bas
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlbe
r
g
rename_re
f
: d
o
n't as
k
re
a
d_ref_f
u
ll where the r
e
f came
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e
Sahlberg
refs
.
c:
pass
the
ref log
m
essa
g
e to _create/delet
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie S
a
h
l
b
erg
refs
.
c: add an er
r
argumen
t
to
d
el
e
te_ref_loo
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
berg
w
rapper
.
c: add a new function unlink_or_msg
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: lock_ref_sha1_b
a
s
ic is used fo
r
all refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lber
g
wrapper
.
c: remove/unlink_or
_
warn: simplify, treat ENOENT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonath
a
n
Nied
e
r
mv test: recreate
m
od/ directory in
s
tead of relyi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jeff King
co
l
o
r
_parse:
d
o not men
t
ion
v
a
r
iab
l
e name in error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jon
a
t
h
an
N
ieder
pass config slots
a
s pointers instead
of off
s
ets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Upda
t
e dr
a
f
t rel
e
a
s
e
n
o
t
e
s to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
mano
Me
r
g
e
branch 'bc/a
s
ciidoc-pretty-formats-fix'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hamano
Merge branc
h
'
rs/plug-leak-in-bundl
e
'
commit
|
commitdiff
|
tree
2014-10-14
J
un
i
o
C
H
am
a
no
Merge branch '
r
s/more-
u
s
e
s-of
-
skip-pref
i
x'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hama
n
o
Merge
b
ranch 'rs/mailsplit'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hama
n
o
Merge branch 'rs/sha1-array-t
e
st'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hama
n
o
Merg
e
b
r
anch
'mh/lockfi
l
e
-stdio'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
g
e
branch
'm
h
/lockfil
e
'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hamano
Me
r
g
e branch
'sk/t
a
g-co
n
tains-wo-
r
ecur
s
i
o
n'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hama
n
o
Merge branch 'da/com
p
letion-show-
s
i
g
natu
r
e'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C
H
amano
Mer
g
e branch 'rs/d
a
emon-fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'dt/
c
ac
h
e-tree-re
p
air'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branch 'so/r
e
base-doc-f
o
r
k
-point'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io
C
Hamano
Merge branch 'da/include
-
compat-ut
i
l-first-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
test-lib
.
sh:
s
u
pport
-x opt
i
on
for
shel
l
-tracing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Ju
n
io C H
a
man
o
t1308: fix broken here docum
e
nt in test scr
i
p
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
hris
t
ian
C
oude
r
Documentation: add doc
u
mentat
i
on for 'git interpret
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trail
e
r:
add tests for c
o
mmands
in c
o
nf
i
g
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: exec
u
t
e
command from
'
tra
i
ler
.
<na
m
e>
.
c
ommand'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian Couder
trailer:
a
dd tests for "git inter
p
ret-trailer
s
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Coude
r
tr
a
i
l
er: add i
n
te
r
pret-trailers
c
omm
a
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
tr
a
iler: put all
the
p
rocess
i
n
g
together an
d
print
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: parse trailers from file o
r
stdin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian C
o
uder
trailer: proce
s
s
c
o
m
mand line trailer arguments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: r
e
ad and process
c
onfig infor
m
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Coud
e
r
trailer
:
process t
r
a
ilers from i
n
put message an
d
a
r
guments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Couder
tra
i
ler: add data stru
c
tures
and basi
c
fu
n
ctio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
car
l
son
Docu
m
en
t
a
tion: fix
mismatched
d
elimi
t
ers
i
n git-imap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
b
r
ia
n
m
.
carlson
Document
a
t
ion: adjust
d
ocumen
t
title underlini
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
René Sch
a
rfe
receive-pack: plug
m
inor memory lea
k
in unpac
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
J
e
ff K
i
ng
t5304: use helper to report failure of "test f
o
o =
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304: use test_pa
t
h_is_* instead of "test -f"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Philip O
a
kley
doc
:
add
'
everyday
'
to 'g
i
t
hel
p
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-10
Ph
i
lip Oakley
doc:
M
ake
f
ile regularise OBS
O
L
ETE_HTML l
i
st 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 Oakle
y
doc
:
modernise e
v
eryday
.
txt wording and forma
t
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
J
unio C Ham
a
no
compl
e
tion: use "gi
t
-C $
t
h
ere" i
n
stead of (cd
$there
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
brian m
.
carls
o
n
Doc
u
menta
t
i
o
n
: fix misrend
e
r of pretty-formats in A
s
cii
d
octor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
Junio C Haman
o
Update draf
t
re
l
e
a
se
n
ote
s
to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-08
Junio C Hamano
Merge bran
c
h 'sp/st
r
eam-clean-filter'
commit
|
commitdiff
|
tree
next