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 'nd/dir-prep-exclude-cleanup'
2014-10-24
Junio C Hamano
Mer
g
e branch 'nd/dir-prep-e
x
clude-cleanup'
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
Merge branch 'eb/no-pt
h
r
e
a
ds'
commit
|
commitdiff
|
tree
2014-10-24
Junio C
H
amano
Merge branch '
w
k/t13
0
4
-
wo-USER'
commit
|
commitdiff
|
tree
2014-10-24
Junio C Haman
o
Merge branch '
t
b
/core
-
fi
l
emode-doc'
commit
|
commitdiff
|
tree
2014-10-24
J
u
nio
C
Hamano
Merge
bra
n
ch
'
r
s/run-comman
d
-
e
nv-array
'
commit
|
commitdiff
|
tree
2014-10-24
Junio
C Hama
n
o
Merg
e
branch 'po/
d
oc-status-markup'
commit
|
commitdiff
|
tree
2014-10-24
Junio C Haman
o
Merge br
a
nch
'
j
k/pack-obje
c
ts
-
no-bit
m
ap-wh
e
n-splitt
i
ng'
commit
|
commitdiff
|
tree
2014-10-21
J
u
n
i
o
C Hamano
Upda
t
e draft release
notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-21
Juni
o
C Hamano
Merge b
r
anch 'js/
c
omplet
i
on-
h
ide-n
o
t-a-repo'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Ham
a
no
M
e
rge
branch 'da/mergetoo
l
-meld'
commit
|
commitdiff
|
tree
2014-10-21
J
unio C Haman
o
M
e
rge
b
r
anch 'da
/
mergetool-tempora
r
y-dire
c
tory'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
M
e
rge branch 'da/merge
t
ool-to
o
l-help'
commit
|
commitdiff
|
tree
2014-10-21
J
u
nio C Hamano
Merge
b
r
anch 'da/mergetool-temporary-f
i
lename'
commit
|
commitdiff
|
tree
2014-10-21
Juni
o
C H
a
man
o
Merge b
r
anch 'da/mer
g
etool-tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hama
n
o
M
e
rg
e
branch
'rs/re
f
-transac
t
ion'
commit
|
commitdiff
|
tree
2014-10-21
Nguyễn
Th
á
i Ngọc Duy
dir
.
c
: remov
e
the s
e
c
o
n
d
declarati
o
n of "st
k
" in prep_exclude()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
Jun
i
o C Hamano
Update draft release notes to 2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
Junio C
Hamano
Mer
g
e branch 'cc/interpr
e
t-trailers'
commit
|
commitdiff
|
tree
2014-10-20
Junio
C Ham
a
no
Merge br
a
nc
h
'r
m
/gitwe
b
-start-form'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
M
erg
e
branch 'ss/contri
b
-subtree-contacts'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C
H
amano
Merge branch 'jn/parse-c
o
nfig-slo
t
'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
Merge branch 'rs/receiv
e
-pac
k
-argv-lea
k
-fix
'
commit
|
commitdiff
|
tree
2014-10-20
Juni
o
C Hamano
M
e
rge b
r
anch '
t
a/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Haman
o
M
e
r
g
e br
a
nch '
j
k/t
e
st-shell
-
trace'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Hamano
Merg
e
branch 'bc
/
a
s
ciidoc'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Rev
e
rt "archive:
hono
r
tar
.
umask even
for
p
a
x headers"
commit
|
commitdiff
|
tree
2014-10-20
To
r
sten Bögershausen
core
.
filemode may need
manual act
i
on
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-20
Philip Oak
l
ey
doc:
f
ix 'git status --he
l
p' c
h
aracter
q
uoting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
W
.
Tre
v
or King
t1304: Set LOGNAME eve
n
if USER is unset or null
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Etienn
e
Buira
Handle atexit list interna
l
y
for unthreaded
b
uilds
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Ren
é
Scharfe
us
e
e
nv_
a
rray member
of struct c
h
i
l
d_proce
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Ren
é
Sch
a
rfe
run-command: ad
d
env_array, an optional argv_arra
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
pa
c
k-objects: t
u
rn off bitmaps when we split packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
J
unio C
Ham
a
no
Merge bran
c
h '
j
c/completion
-
no-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge bran
c
h 'bw
/
trace-no-inlin
e
-getnanotime'
commit
|
commitdiff
|
tree
2014-10-16
Junio C Hamano
Merge
branch
'
p
o/everyday-doc'
commit
|
commitdiff
|
tree
2014-10-16
R
o
lan
d
Mas
g
i
tweb: use start_
f
orm, no
t
startform
tha
t
was removed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
Davi
d
Aguilar
t7610-merg
e
tool: ad
d
test cases
f
or mergetool
.
w
rite
T
oT
e
mp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
l
a
r
m
e
r
g
etool: add an option for writing to
a temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
m
e
r
ge
t
oo
l
: use more co
n
servati
v
e
te
m
porary
fil
e
n
ames
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-func
t
ions: adjust style to
match
C
odin
g
Guidelines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David
Aguilar
t7610-mergetool: us
e
t
e
st_config t
o
i
s
olate te
s
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-16
David A
g
ui
l
ar
mergetools/meld: make
usa
g
e
o
f `--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
S
e
b
a
stian Schub
e
rth
contact
s
: add a
Makefile
to
g
enera
t
e
docs
and
i
ns
t
a
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Seba
s
t
ian Schub
e
rth
subtree
:
add
a
n i
n
s
t
al
l
-html target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
dif
f
too
l
: do
n
'
t
assu
m
e that default sh is sane
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
mergeto
o
l
:
d
o
n't
require a work tre
e
f
or --tool-
h
elp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
git-s
h
-setup: m
o
ve GIT_DIR initializ
a
tion into a fun
c
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
D
avid Aguilar
mergetool: use more 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
D
avid
A
guilar
test-
l
ib-func
t
ions:
a
d
just style to
m
a
tch CodingGuidelines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Da
v
id Ag
u
ilar
t761
0
-mergetool
:
p
refer t
e
st_config over
g
it c
o
n
f
ig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
David Aguilar
t7610-mergetool: add mis
s
i
ng &
&
and remove co
m
mented
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Davi
d
Aguilar
t7610
-
mergetoo
l
: use tabs instead of a mix o
f
t
a
bs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nieder
ref_trans
a
ction_commit: b
a
il out on failure
to rem
o
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan Nieder
lockfi
l
e: remove unable_to_lock_error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonathan
Ni
e
der
ref
s
.
c
:
do not permit err == NUL
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahlberg
remot
e
rm/prune: print a message whe
n
w
r
i
t
ing packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
for-each-ref: skip and warn abo
u
t
broken ref names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ro
n
n
ie Sahlberg
refs
.
c: allow listi
n
g and del
e
t
ing badly named refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronni
e
Sahlberg
t
e
st: put tests for handling of bad ref names i
n
one
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jo
n
a
t
han Nieder
packed-re
f
c
ache: forbid dot-
c
omponents i
n
refn
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e Sahlberg
b
ranch -d: simplify by using RESOLVE_REF_READING
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
N
i
eder
bra
n
c
h
-
d
: avo
i
d repeated symref resoluti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Junio
C H
a
mano
r
eflog test: test interact
i
on with detached HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie Sahlber
g
r
e
fs
.
c: change re
s
olv
e
_ref_
u
nsafe
r
eadi
n
g a
r
g
u
ment
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronn
i
e
Sahl
b
erg
refs
.
c
:
m
ake w
r
ite_re
f
_
sha1
s
t
ati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
onn
i
e Sahl
b
erg
fetch
.
c: chan
g
e
s_update
_
re
f
to use a ref
tr
a
ns
a
c
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sa
h
lbe
r
g
refs
.
c: ref_t
r
an
s
action_comm
i
t: disti
n
g
ui
s
h n
a
me conflic
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
S
ahlberg
refs
.
c: pass a
lis
t
o
f names
t
o skip t
o
is_
r
efname_a
v
ailabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlberg
r
e
f
s
.
c: cal
l
lo
c
k_ref_sha1_basic dir
e
ctly fro
m
commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie
Sahlberg
r
e
fs
.
c:
refu
s
e to lock badly named refs
i
n lock
_
ref_sha1
_
basic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sahl
b
erg
rename_r
e
f: d
o
n'
t
ask
r
ead
_
r
ef_fu
l
l where the
r
e
f
ca
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
nnie
S
ahlberg
re
f
s
.
c: pa
s
s t
h
e ref lo
g
message to _cre
a
te/de
l
ete
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lber
g
refs
.
c: add
a
n
e
r
r
a
rgumen
t
to d
e
lete_ref_l
o
os
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ron
n
ie Sahlber
g
wra
p
per
.
c: add a new funct
i
on
u
nlink_or_msg
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
R
o
n
n
i
e Sahlberg
refs
.
c: lock
_
ref_sh
a
1_basic is used for all re
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Ronnie Sa
h
lberg
w
rapp
e
r
.
c: re
m
o
v
e/unlink_o
r
_warn:
simpl
i
fy, treat EN
O
ENT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-15
Jonatha
n
Nie
d
e
r
mv
t
est: r
e
cr
e
ate mod/
d
irectory instead o
f
r
e
lying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
John Sza
k
mei
s
t
e
r
comple
t
ion:
silenc
e
"
fata
l
: N
o
t a git repos
i
tory"
error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jeff K
i
ng
c
o
lor_parse: do no
t
mention variable
name
in error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jonathan Nieder
pass config slots as pointers instead
of offset
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
U
p
date draf
t
release notes to
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o
C
Ham
a
no
Merg
e
branch
'
b
c/asciidoc-pretty-
f
o
rma
t
s-fix'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C
Hamano
Merge br
a
nch 'r
s
/
plu
g
-le
a
k-in-bundle'
commit
|
commitdiff
|
tree
2014-10-14
J
u
nio C Hamano
Merge branch 'rs/m
o
re
-
uses-of-skip-pre
f
ix'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
H
amano
Mer
g
e branch 'rs/m
a
ilsp
l
it
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C H
a
mano
Merge
bra
n
ch '
r
s/s
h
a1-array-test'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge branch 'mh/lockfile-stdio'
commit
|
commitdiff
|
tree
2014-10-14
J
uni
o
C Hamano
Merge br
a
nch 'mh/lockfile
'
commit
|
commitdiff
|
tree
2014-10-14
Jun
i
o
C Hamano
Merge bran
c
h 'sk/tag-cont
a
ins-wo-recurs
i
on'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
M
erge
b
ranch '
d
a/comp
l
e
tion-show-s
i
gnature'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Merge bra
n
ch 'rs/daem
o
n
-fixe
s
'
commit
|
commitdiff
|
tree
2014-10-14
Junio C
Ha
m
ano
Me
r
ge
b
r
a
nch 'dt/cache-tree-repair'
commit
|
commitdiff
|
tree
2014-10-14
J
unio C Hamano
Merge bra
n
ch 'so/rebase-doc-
f
o
rk-point'
commit
|
commitdiff
|
tree
2014-10-14
Junio C Hamano
Me
r
ge bra
n
ch 'da/i
n
clude-compat-util-first-in-c'
commit
|
commitdiff
|
tree
2014-10-13
Jeff King
test-
l
ib
.
sh: support -x optio
n
f
or
shell
-
t
racing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
J
unio C Hamano
t1308: fix
b
roken here
doc
u
ment in test script
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
Do
c
umenta
t
ion: add documentation for
'git interp
r
et
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
ti
a
n Cou
d
er
t
railer: add tests for commands in config file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian
C
ou
d
er
traile
r
: execute c
o
mmand from 'trailer
.
<name>
.
com
m
an
d
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next