repo.or.cz
/
git
/
mingw
/
j6t.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
Jun
i
o C Hamano
Merg
e
bran
c
h 'da/mergetoo
l
-
temporary
-
d
i
rec
t
ory'
commit
|
commitdiff
|
tree
2014-10-21
J
unio C
Haman
o
Merge branch 'da/merge
t
ool-tool-
h
elp'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Me
r
ge branch '
d
a/me
r
getool-temp
o
ra
r
y-filename'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
M
erge b
r
an
c
h
'da/mergetool-tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Ha
m
ano
Mer
g
e branch 'r
s
/ref-tr
a
nsactio
n
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Update draft rele
a
se notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C H
a
mano
Merge branch 'cc/interpret-tr
a
i
l
e
r
s'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
e
rge branch
'
rm/gitweb-start-form'
commit
|
commitdiff
|
tree
2014-10-20
J
uni
o
C Hamano
Merge b
r
anch 'ss/contri
b
-subtree-con
t
acts'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Hama
n
o
M
e
rge branch 'jn/parse-con
f
ig-
s
lot'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 'rs/
r
eceive-pack-ar
g
v-leak-fix'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C
Hamano
Merge branch 'ta/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
a
mano
Merge branch 'jk/test-shell-trace'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge bra
n
ch 'bc/asci
i
doc'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Haman
o
Reve
r
t "archive: honor tar
.
uma
s
k
eve
n
for pax headers
"
commit
|
commitdiff
|
tree
2014-10-16
J
unio C Hamano
Merge branch 'jc
/
completion
-
no-
c
h
d
i
r'
commit
|
commitdiff
|
tree
2014-10-16
Junio C
Hamano
Mer
g
e branch 'bw/trac
e
-no-
i
nline-getnan
o
time'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
M
erge
bran
c
h
'po/ev
e
ryd
a
y-d
o
c
'
commit
|
commitdiff
|
tree
2014-10-16
Roland
Ma
s
gitweb: use start_
f
or
m
, not startf
o
rm that was
removed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Ag
u
ilar
t7610-mergetoo
l
: add test
c
ase
s
for
m
erget
o
ol
.
w
r
i
t
eToTemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
me
r
getoo
l
: add an op
t
ion for w
r
iting t
o
a temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Dav
i
d
A
g
u
i
la
r
mergetool:
use mor
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-16
D
avid Aguilar
t
est-lib-fun
c
t
i
ons:
a
djust style to match Co
d
i
n
gGuidelines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid Aguilar
t7
6
10-mergetool: use
test_config to isolat
e
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
S
ebast
i
an Schuberth
c
ontacts: add
a
Makefile
to generate docs and instal
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Sebastian Schuberth
subtree: add an install-
h
tml target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arle
s
Baile
y
difftool: don't as
s
ume that default sh is sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es B
a
iley
m
e
r
ge
t
ool
:
don'
t
require a
w
ork tree for -
-
tool
-
help
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
git-sh-setup: mo
v
e
G
IT_DI
R
i
n
i
t
iali
z
ation into a function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
mergetoo
l
: use mo
r
e conservative t
e
mporary filenames
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Dav
i
d Ag
u
ilar
test-lib-fu
n
ctions: adjust
style to match CodingG
u
idel
i
nes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610-mergetool:
pref
e
r
t
est_config
over git config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
D
a
v
id
Aguilar
t7610-mer
g
etool
:
add missing &
&
and remove comme
n
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
David
A
g
u
ilar
t7610-mergetool: us
e
t
a
bs instead of
a
mix of tabs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref_transac
t
ion_comm
i
t: b
a
il out
o
n fa
i
l
u
re to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jon
a
than Nieder
lockfile:
re
m
ove unable_to_lock_
e
rror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
ref
s
.
c: do
n
o
t per
m
i
t
err ==
N
ULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlb
e
rg
r
emote
rm/pr
u
ne: p
r
i
nt a messa
g
e when writing packed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
onnie Sahl
b
erg
for-each-ref: skip
a
n
d
w
a
rn a
b
out b
r
oken ref na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
re
f
s
.
c: allow li
s
ting an
d
deleting badly named refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie S
a
hlberg
test: put tests
f
or handling o
f
bad ref
names in
one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jo
n
ath
a
n Nieder
pac
k
ed-ref
c
a
c
he:
f
orbid d
o
t
-
compon
e
nts in re
f
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahl
b
erg
bra
n
ch -d: simp
l
ify by using
R
ESOLVE_REF_READING
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Ni
e
der
br
a
nch -d: avoid r
e
peated s
y
m
r
ef re
s
olut
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Junio C Ha
m
ano
r
e
f
log test: test interaction with detache
d
HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
r
efs
.
c:
c
hange resolve_ref_unsafe reading ar
g
u
me
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
nie Sahlber
g
r
efs
.
c:
make write_ref_sha1 s
t
ati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
fetch
.
c: change s_up
d
ate
_
ref
t
o
use a ref trans
a
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
nie Sahlberg
ref
s
.
c: re
f
_transaction_commi
t
: di
s
tinguish name con
f
licts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
r
e
fs
.
c
: pass a l
i
s
t of nam
e
s to sk
i
p to is_refname_availabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlbe
r
g
refs
.
c: call l
o
ck_
r
ef_sha1_
b
asic directly from
commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sah
l
berg
refs
.
c: r
e
fu
s
e to lock badly named refs in lock_
r
e
f
_sha
1
_basic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
rename
_
ref
:
don'
t
a
s
k
r
e
ad_ref_full where
the ref
c
a
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
n
i
e Sahlberg
refs
.
c: pass
the
ref log
messa
g
e to
_
crea
t
e
/
delete
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sah
l
berg
refs
.
c: add a
n
e
rr ar
g
ument to delete_ref_loose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
wrapper
.
c: add a new func
t
ion unlink_or_msg
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
n
ie Sahlberg
r
efs
.
c: lock_ref_sha1_basic is used for all refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sah
l
berg
wr
a
pper
.
c
: remove/u
n
link_or_warn: simplify, tre
a
t
E
NO
E
N
T
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-15
J
ona
t
ha
n
Nied
e
r
mv
t
es
t
: recre
a
te mod/ dir
e
c
t
ory ins
t
e
a
d of relying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
e
f
f King
color_parse: do not mention vari
a
b
l
e
name in error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan Nieder
pass config slo
t
s as
pointe
r
s instead of of
f
s
e
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hamano
U
pdate draft release notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-14
Juni
o
C Ha
m
ano
Me
r
ge branc
h
'
bc/a
s
c
i
idoc-p
r
e
t
ty-for
m
a
t
s-fix'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o C Ham
a
no
M
erge br
a
n
c
h
'rs/plug-lea
k
-in-bundle'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
e
rge branch 'rs/
m
ore-uses-o
f
-skip-p
r
ef
i
x
'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
H
amano
Merge branch 'rs/mailspli
t
'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio
C
Hamano
Merge b
r
anc
h
'rs/sha
1
-arr
a
y
-
t
est'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C Hamano
Merge br
a
n
c
h 'mh/l
o
ckfile-s
t
dio'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Hamano
Merge branch 'mh/lockfile'
commit
|
commitdiff
|
tree
2014-10-14
Junio
C
Haman
o
Me
r
ge
b
ra
n
ch 'sk/ta
g
-co
n
tains-wo-recur
s
ion'
commit
|
commitdiff
|
tree
2014-10-14
J
unio
C
Hamano
Mer
g
e
b
r
anch 'da/compl
e
tion-show-signature'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C
Hamano
Merge branch 'rs/daemon-fixes
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
amano
Merge b
r
anch 'dt/cache-tre
e
-
repair'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge
bran
c
h '
s
o/rebase-doc
-
f
ork-point'
commit
|
commitdiff
|
tree
2014-10-14
Ju
n
io C Ha
m
ano
Merge bran
c
h 'da/include-compat-util-first-
i
n-c
'
commit
|
commitdiff
|
tree
2014-10-13
Jeff Ki
n
g
test
-
lib
.
sh: sup
p
ort -x o
p
tion for
shell
-
tracing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jun
i
o C Hamano
t1308: fix broken here document in t
e
st s
c
rip
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
Documen
t
ation: add documenta
t
ion
f
or
'git in
t
erpret
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: add tests for co
m
mand
s
in
config file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian Co
u
der
t
r
ailer:
e
xec
u
te command from 'trailer
.
<
n
ame>
.
comm
a
nd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Couder
trai
l
er: add tests
for "git
i
n
t
erpret-trailers"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Co
u
der
trail
e
r:
add in
t
e
rpret-trailers command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: put all
the pro
c
e
s
s
i
ng together
a
nd print
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
C
h
risti
a
n Co
u
der
trailer:
p
a
r
se trailer
s
from file
o
r s
t
din
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stia
n
Couder
traile
r
:
p
rocess co
m
mand line trailer arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: re
a
d and process
c
onfig infor
m
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Co
u
der
trailer:
p
rocess trailers from input
m
e
ssage and arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
traile
r
:
add data structures and basic functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
br
i
an
m
.
carls
o
n
Documentation: fi
x
mismatched d
e
limit
e
rs in git-imap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
brian m
.
carl
s
on
Documentation
:
a
djust document title unde
r
lining
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
René S
c
harfe
receive-pack:
plug minor
m
emory leak in
unpa
c
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
t5304: use helper
to repo
r
t failur
e
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 of
"
t
est -f"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Phil
i
p Oak
l
ey
doc: add 'everyday' to 'git help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-10
Phili
p
Oakley
doc: Makef
i
le regularise 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
Ph
i
lip Oakley
doc: modernise eve
r
y
day
.
txt wording
and 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 Haman
o
completion: use "git -C $there" instead of (cd $there
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
brian m
.
carlson
Documentation: fix mi
s
rend
e
r of
pretty-formats
in Asciidoctor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
Junio C
Hamano
Update draft release notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-08
Junio C Ha
m
ano
Merge
b
ranch 'sp/stream-clean-
f
ilter'
commit
|
commitdiff
|
tree
next