repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with Git 2.1.3
2014-10-29
Junio C Haman
o
Sync with Gi
t
2
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Junio C H
a
mano
Git
2
.
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Juni
o
C Haman
o
M
e
rge br
a
nch 'jk/pack-objects
-
no-bitm
a
p
-whe
n
-splitting
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io
C Hamano
Merge branc
h
'
d
a/mergetool-meld'
i
nto
m
aint
commit
|
commitdiff
|
tree
2014-10-29
Junio
C
Hama
n
o
Merge br
a
n
c
h 'rm/gitweb-start-form' into
m
aint
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io C Hamano
Merge branch 'b
c
/asciidoc
-
pretty-formats
-
fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hamano
Merge br
a
n
ch 'rs/
d
aemo
n
-
fi
x
es
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2014-10-29
Junio C Hama
n
o
U
p
d
ate d
r
af
t
release
n
o
tes t
o
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io C Hamano
Me
r
ge branch 'da/difftool'
commit
|
commitdiff
|
tree
2014-10-29
J
unio C Hamano
Merge branch 'rb/pack-
w
indow-memory-config-d
o
c'
commit
|
commitdiff
|
tree
2014-10-29
J
unio C Hamano
Me
r
ge b
r
anc
h
'mg/lib
-
gpg-ro-safet
y
'
commit
|
commitdiff
|
tree
2014-10-29
Jun
i
o
C
Haman
o
Merge branch 'dm/port2zos'
commit
|
commitdiff
|
tree
2014-10-29
J
unio C Hamano
Merge branch 'oc/mergetools-beyond
c
ompar
e
'
commit
|
commitdiff
|
tree
2014-10-29
Ju
n
io
C
Haman
o
Me
r
ge branch 'jk/prune-m
t
i
me'
commit
|
commitdiff
|
tree
2014-10-29
J
u
ni
o
C Hamano
Merge br
a
nch 'bc/asci
i
doctor'
commit
|
commitdiff
|
tree
2014-10-28
Dav
i
d Aguila
r
difftool: add support for --trust-exit-code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-28
Robert de Bath
c
onfig
.
txt:
pack
.
w
i
ndo
w
m
e
mory limit a
p
plies
p
er-t
h
r
ead
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
M
i
cha
e
l J Grube
r
t/
l
ib-gp
g
:
m
ak
e
gpghome
f
iles w
r
i
t
a
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
brian m
.
carlson
Documen
t
ati
o
n: r
e
move Asciidoctor linkgit macro
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
brian m
.
carlson
Documentation: refactor common
o
perations into
v
ariables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
Dav
i
d
Michael
c
ompat/b
s
wap
.
h: detec
t
endianness
from XL C compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
Da
v
id M
i
chael
Makefile
:
r
e
orde
r
linker f
l
ags in the git
e
xecutable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
Davi
d
M
i
chael
git-compat-util
.
h:
s
upp
o
rt
va
r
iadi
c
mac
r
os with the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-27
Johannes S
i
xt
difftool--helper: exit when
read
i
n
g
a prompt answer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
J
u
nio C Hamano
Update draft release notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
Me
r
ge
b
ranch 'jc/push-cert'
commit
|
commitdiff
|
tree
2014-10-24
Junio
C Hamano
Mer
g
e branc
h
'sb/plug-tr
a
nsport-leak'
commit
|
commitdiff
|
tree
2014-10-24
Ju
n
io C Ha
m
a
n
o
Me
r
g
e
branch 'nd/dir-prep-exclude-cleanup'
commit
|
commitdiff
|
tree
2014-10-24
Junio C H
a
mano
Merge branch 'e
b
/no-
p
t
h
reads'
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
Merg
e
b
r
anch
'wk/t1304-
w
o-USER'
commit
|
commitdiff
|
tree
2014-10-24
J
u
nio
C
Hamano
M
erge branch 'tb/core-
f
ilemode
-
doc'
commit
|
commitdiff
|
tree
2014-10-24
Junio
C Hama
n
o
Merge
b
r
anch 'rs/
r
un-comm
a
nd-env-array'
commit
|
commitdiff
|
tree
2014-10-24
Junio C Hamano
Merge branch
'po/doc
-
s
tatus-mark
u
p
'
commit
|
commitdiff
|
tree
2014-10-24
Junio C
H
aman
o
Merge branch
'
jk/pack-objects-no-
b
itmap
-
when-
s
plitting'
commit
|
commitdiff
|
tree
2014-10-24
M
i
ch
a
el J G
r
uber
pus
h
: heed u
s
er
.
signi
n
gkey for signe
d
pushes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
U
pdate
d
raft release notes
t
o 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Ju
n
io
C
H
amano
Me
r
ge branch
'js/comp
l
eti
o
n-hi
d
e-not
-
a-rep
o
'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge branch 'da/merge
t
o
o
l
-meld'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge b
r
a
n
ch 'd
a
/merge
t
ool-
t
emporar
y
-directory'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Merge
branch 'da/me
r
g
etool-tool-help'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Mer
g
e branch 'da/m
e
rget
o
ol-temporary-filename'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Haman
o
Merge branch 'da/m
e
rgetool-tests'
commit
|
commitdiff
|
tree
2014-10-21
Junio C Hamano
Mer
g
e branch 'rs/ref
-
transaction
'
commit
|
commitdiff
|
tree
2014-10-21
J
u
n
io C Hamano
merg
e
tool: rename bc3 t
o
bc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Nguyễ
n
Thái Ngọ
c
Duy
dir
.
c: re
m
ove the second declaration
of "stk"
i
n prep_
e
x
c
lude()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Stefan Beller
.
mailmap: add St
e
f
a
n
Bellers corporate mail address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-21
Stefan Beller
t
r
ansport: free
l
eakin
g
hea
d
in
t
ranspo
r
t_p
r
int_
p
us
h
_s
t
atus
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
U
pdate draft release notes to 2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 'cc/in
t
erp
r
et-t
r
a
i
lers'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Hamano
Merg
e
branc
h
'rm/g
i
t
w
eb-start-for
m
'
commit
|
commitdiff
|
tree
2014-10-20
Ju
n
io C Ham
a
n
o
Merge branch 'ss
/
contri
b
-su
b
tree-contacts'
commit
|
commitdiff
|
tree
2014-10-20
Junio C
H
amano
Mer
g
e branch 'jn
/
parse-co
n
fig-slot'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Hamano
Merge branch 'rs/receive-pack-a
r
gv-leak-fix'
commit
|
commitdiff
|
tree
2014-10-20
J
unio
C
Hamano
M
erge branc
h
't
a
/config-set'
commit
|
commitdiff
|
tree
2014-10-20
Junio C Ha
m
ano
Merge branch 'j
k
/test-
s
h
e
ll-trace'
commit
|
commitdiff
|
tree
2014-10-20
J
uni
o
C
Ha
m
a
no
Mer
g
e branch 'bc/asciid
o
c'
commit
|
commitdiff
|
tree
2014-10-20
J
u
nio C Hamano
Revert "
a
rchi
v
e: honor tar
.
umask even for pax headers"
commit
|
commitdiff
|
tree
2014-10-20
Tor
s
ten Bögershausen
c
o
re
.
filemode may need manual ac
t
i
o
n
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-20
Philip Oakley
doc: fix
'gi
t
status --help' character quoting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
W
.
Trevor King
t1304:
S
et LOGNAME even if USER is unse
t
or null
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
E
t
ienne Buira
Han
d
le atexit lis
t
intern
a
l
y
for unthreaded builds
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
drop add_ob
j
ect_array_with_mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Ramsay Jones
revision: re
m
ove
d
efi
n
ition of
u
nused 'add_object'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Ren
é
Sc
h
arfe
us
e
env_array member of struct child_process
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Re
n
é S
c
harfe
run-command: add env_array, a
n
optional
a
rgv_arr
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
pack-objects:
t
urn off
b
itmaps when we
split
p
a
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jef
f
King
pack-
o
bjects: double-c
h
e
c
k options befo
r
e
d
i
scarding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
repack: pack obje
c
ts mentioned by the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
pack-objects: use
argv
_
array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
reac
h
abl
e
: use re
v
ision
m
achinery
'
s --indexed-o
b
jects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
J
eff Ki
n
g
re
v
-l
i
st: a
d
d --indexed-objects option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff
K
ing
re
v
-list:
d
ocument --reflog op
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
J
eff K
i
ng
t5516: test pu
s
hing a tag of an otherwise unre
f
e
r
enced
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-19
Jeff King
tra
v
e
rse_commit_list: support pe
n
d
i
n
g
b
lobs/trees with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Junio
C
H
amano
Merge
bra
n
c
h
'j
c
/
c
omple
t
ion-no-chdir'
commit
|
commitdiff
|
tree
2014-10-16
Junio C H
a
mano
Me
r
g
e bra
n
ch
'bw/trace-
n
o
-inl
i
ne-
g
etnanotim
e
'
commit
|
commitdiff
|
tree
2014-10-16
J
unio C
H
am
a
n
o
Merge
br
a
nch 'po/everyday-doc'
commit
|
commitdiff
|
tree
2014-10-16
Ro
l
a
n
d Mas
gitweb: u
s
e start_form, not startfo
r
m
t
hat was removed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
avid
Aguilar
t7610-
m
ergetool: add test cas
e
s fo
r
m
e
rgetool
.
w
r
iteT
o
Temp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Agu
i
lar
me
r
ge
t
o
ol: a
d
d an option for writing
to
a
temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
mergetool
:
use more cons
e
rvati
v
e
t
e
mpor
a
ry filenames
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
i
d Aguilar
test-lib
-
functions: adjust style to
match CodingGui
d
elines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
David Aguilar
t76
1
0-merget
o
ol: use test_config to isolate tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
D
a
vid
Aguilar
mergetoo
l
s/meld: make usag
e
of `--outp
u
t
`
c
o
nfigura
b
le
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
make add
_
o
b
jec
t
_arr
a
y_with_context interface more sane
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
write_s
h
a
1
_f
i
le: freshen ex
i
sting ob
j
ec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
pack-objects:
m
at
c
h prun
e
logic
f
or disc
a
rding objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
e
ff
Ki
n
g
pack-objects: refactor unpack-unreachable ex
p
ira
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
prune:
keep objects reachable from r
e
ce
n
t obj
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
sha1_file
:
add
f
or_ea
c
h iterators for loose and packed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
eff K
i
ng
count-o
b
je
c
ts:
u
s
e for_each_loose_
f
i
l
e_in_objdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
count-obje
c
ts: do n
o
t use
x
size_t whe
n
counting object
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
prune-p
a
cked: use fo
r
_each_loo
s
e_fil
e
_
in_
o
bjdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
e
ff King
reacha
b
le:
ma
r
k index
b
lobs as SEEN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
prun
e
: f
a
c
t
or out lo
o
se-
o
bje
c
t d
i
rec
t
ory traversal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jef
f
King
reachable: reus
e
rev
i
sion
.
c
"add all reflogs" c
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
reac
h
able: use tr
a
verse_com
m
i
t_list instead of custom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
J
eff King
cl
e
an up name a
l
location in prepare_revisi
o
n_walk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff King
object_array: add
a "clea
r
" fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-10-16
Jeff Ki
n
g
obj
e
ct_array: factor out
slopbuf-freeing l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next