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-meld'
2014-10-21
Ju
n
io C Haman
o
Merge b
r
anch 'da
/
mergetool-meld'
commit
|
commitdiff
|
tree
2014-10-21
J
unio C Haman
o
Merge b
r
anch 'da/mergetool
-
temp
o
rary-directory'
commit
|
commitdiff
|
tree
2014-10-21
Junio C
H
amano
Merge
b
ranch 'd
a
/mergetool-tool-he
l
p'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge branch 'da/mergetool
-
tempo
r
ary-filename'
commit
|
commitdiff
|
tree
2014-10-21
Junio C H
a
man
o
Mer
g
e bran
c
h
'
da/merge
t
ool-tests'
commit
|
commitdiff
|
tree
2014-10-21
Jun
i
o C Hamano
Merge branch 'rs/r
e
f-transacti
o
n'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io C
Hamano
Updat
e
draft release notes
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hamano
Mer
g
e b
r
anch
'c
c
/interpret-tra
i
l
ers'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io
C
H
amano
Me
r
g
e branch 'r
m
/gitw
e
b
-s
t
ar
t
-form'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
erge b
r
anch 'ss/contrib-
s
ubtre
e
-contacts'
commit
|
commitdiff
|
tree
2014-10-20
Junio C H
a
m
a
n
o
Merg
e
branch 'jn/parse
-
co
n
fig-slot
'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C Hamano
Merge bra
n
ch 'rs/
r
ec
e
ive-pac
k
-arg
v
-lea
k
-fix'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C
Ham
a
no
M
e
rge
branch '
t
a/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
H
amano
Merge branch 'jk/
t
est-
s
hell-trace'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hamano
Merge branch 'bc
/
asciidoc'
commit
|
commitdiff
|
tree
2014-10-20
J
unio C Hamano
Rev
e
rt "archive: honor
t
ar
.
umask eve
n
f
o
r pax headers
"
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
Ham
a
no
Merge
branch 'jc/completion-no-chdir
'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge branc
h
'
b
w/tra
c
e
-
no
-
inli
n
e-getnanot
i
me'
commit
|
commitdiff
|
tree
2014-10-16
Junio C
H
amano
Merge b
r
anch 'p
o
/
e
v
eryday-doc'
commit
|
commitdiff
|
tree
2014-10-16
Roland Mas
gitweb
:
use sta
r
t_fo
r
m, not star
t
fo
r
m that was remov
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t7610-mergetool: add
test cases for merget
o
ol
.
writeToT
e
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
guilar
mergetool: add
a
n option for writi
n
g
t
o a
t
emp
o
rary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
mergetool: use
m
o
r
e con
s
e
rva
t
ive
t
empora
r
y
filenam
e
s
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
test
-
lib-functions:
a
djust
style to mat
c
h Codi
n
gGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t
7
6
10-mergetool: use test_confi
g
to is
o
la
t
e
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David
A
g
u
ilar
mergetools
/
meld: make usage of `--
o
utput` configu
r
a
b
le
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schube
r
th
co
n
tacts: add a Mak
e
file to generat
e
docs and install
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian
S
chube
r
t
h
subtree: add an instal
l
-
h
tml target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ch
a
r
l
es Bailey
difftoo
l
:
don't assum
e
t
h
at def
a
ult sh is sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
m
erget
o
ol
:
d
o
n't require a work tree for --tool
-
hel
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id Aguilar
git-s
h
-setup:
move GIT_DIR
initialization int
o
a function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetool: use more conservative te
m
p
o
r
ary
filename
s
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 Ag
u
i
l
ar
test-lib-functi
o
ns:
a
djust s
t
y
le to
m
atch Cod
i
ngGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Ag
u
ilar
t7610
-
mergetool:
pref
e
r test_conf
i
g
over git c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Agu
i
lar
t
7
6
1
0
-
mergetool: add mis
s
ing && and remove comm
e
nted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
guilar
t7610-merge
t
ool
:
use tabs
instead o
f
a m
i
x of tab
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref_transa
c
tion_commi
t
: bail out on failure to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nieder
lockfile: remove una
b
le_to
_
lock_error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
on
a
tha
n
N
ieder
refs
.
c: do no
t
p
e
rmit err == NULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
ni
e
Sah
l
berg
remote rm/p
r
une: print a message when wri
t
i
ng packed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
for-each-ref: skip an
d
warn
a
bout br
o
ken r
e
f names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: allow
l
is
t
in
g
and deleting b
a
dly
named refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
test: put
t
ests
f
or hand
l
ing of bad ref n
a
mes in one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nie
d
e
r
p
acked
-
re
f
cache: forbid dot-components
i
n refn
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
branch -d: s
i
mplify by
u
s
i
ng
R
ESOLVE_REF_READING
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
onathan Nieder
branch -d
:
avoid repeated
symref
r
esol
u
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ju
n
io
C Ham
a
no
r
e
flog test
:
test interactio
n
with deta
c
hed HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onni
e
Sahlb
e
r
g
refs
.
c:
c
hange re
s
olve_ref_u
n
safe
r
e
a
ding
argument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie
Sahl
b
erg
refs
.
c:
m
ake wri
t
e_ref
_
sha1 static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlberg
fetch
.
c
:
change s_update_
r
ef to use a ref t
r
ansac
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlberg
refs
.
c: ref_tr
a
nsaction_commit:
d
istingu
i
sh na
m
e con
f
licts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
refs
.
c: pass a list of nam
e
s
t
o skip to
i
s_r
e
fname_availab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahl
b
e
r
g
r
efs
.
c: call lo
c
k
_ref_sha1_basic directly from com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlb
e
r
g
r
efs
.
c
:
r
efuse to lock badly na
m
ed refs in lock
_
ref_
s
ha1_basic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sah
l
ber
g
rename_ref:
don't as
k
read_
r
ef_full
w
here the r
e
f
came
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahlberg
refs
.
c: pass t
h
e ref
l
og mes
s
age
to _c
r
e
ate/dele
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
refs
.
c: add
a
n
err argument to
d
elete_ref_loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlberg
wrapper
.
c
: a
d
d
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_sha
1
_basic is used fo
r
all
r
efs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
n
ie Sahl
b
er
g
wrapp
e
r
.
c: remove/unli
n
k_or_
w
arn:
s
i
m
plify, tr
e
a
t
ENOENT
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
o
nathan Niede
r
m
v
te
s
t
: recreate mod/
d
ire
c
tory instead of relyin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
e
ff Kin
g
color
_
parse: do
n
o
t mention va
r
iabl
e
na
m
e
i
n e
r
ror
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jona
t
ha
n
Nieder
p
a
ss config slots as poin
t
ers instead of
o
ffsets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Up
d
ate draft release
notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
amano
Merge bran
c
h 'bc/asciidoc-
p
retty-formats-fix'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hamano
Me
r
ge branch
'
r
s
/
plug-
l
eak-in-bundle'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge b
r
anch 'rs/m
o
r
e-uses-of-skip-prefix'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C H
a
mano
Merg
e
branch
'rs/mails
p
lit'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C
Ha
m
ano
M
erge bra
n
ch 'rs/sha1-
a
rray-test'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Ha
m
ano
Merge branch 'm
h
/lo
c
kfile-stdio'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge branch 'mh/lockfile'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C
H
a
mano
M
erge branch '
s
k/
t
ag-cont
a
i
ns-w
o
-re
c
ursion'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
Merge branch 'da/completion-
s
ho
w
-signature'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Haman
o
M
e
r
g
e branch 'rs/daemon-fixes'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Me
r
ge branch '
d
t/cac
h
e-tr
e
e
-
rep
a
ir'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge branc
h
's
o
/rebase
-
doc
-
fork-poi
n
t'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Hamano
Merg
e
b
ranch
'
d
a
/include-comp
a
t-util-
f
irst-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff Kin
g
test-lib
.
sh: s
u
pport -x option
for shell-tracing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Junio
C
Hama
n
o
t1308: fix br
o
ken
here document in t
e
st script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coude
r
Documenta
t
ion: add documentation for 'gi
t
interpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
s
t
ian Coude
r
trailer: add tes
t
s fo
r
com
m
a
nds in confi
g
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer
:
execute
comman
d
from 'trail
e
r
.
<name>
.
command'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer:
a
dd
t
ests f
o
r "git interp
r
et-trai
l
ers
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Cou
d
e
r
trail
e
r:
a
d
d int
e
rpret-tra
i
lers co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
t
r
a
iler: p
u
t all the proce
s
s
i
ng toget
h
er and print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hr
i
stian Couder
trail
e
r:
p
arse
trailers fr
o
m file or stdi
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
trailer:
process command line tr
a
iler arg
u
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an C
o
uder
t
r
ailer: read and process c
o
nfig information
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian C
o
uder
trailer:
process
t
railers from
i
nput message
and
argu
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
tian Couder
tra
i
ler: add data structure
s
and basic func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
car
l
s
on
Docum
e
ntat
i
on: fix m
i
smatched delimiters i
n
git-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
ca
r
lson
D
ocumentation: adj
u
s
t document title unde
r
lini
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
René
Scharfe
receive-pack: plug min
o
r m
e
mory le
a
k
i
n
unpack()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Je
f
f King
t5304: use helper t
o
r
eport 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
_
is_* instead o
f
"tes
t
-f"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip
O
akley
doc: add
'every
d
a
y'
t
o 'git help
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Philip Oakley
doc
:
Makefile
r
egularise OBSOLETE_HTML list buildi
n
g
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Phili
p
Oakley
doc: m
o
d
ernise e
v
ery
d
ay
.
txt
w
ording and form
a
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 Hamano
c
ompletion: u
s
e
"git
-C $there" instead of
(
c
d
$
there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
bria
n
m
.
carls
o
n
D
ocumentat
i
on:
fix m
i
srender
o
f pretty-f
o
r
mats in Asciidoctor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next