repo.or.cz
/
alt-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-winmerge'
2015-06-01
J
u
nio C Ham
a
no
Merge br
a
nch 'da/merge
t
ool-winmerge'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Ham
a
no
M
e
rge b
r
anc
h
'mc/comm
i
t-
d
o
c-grammo
f
ix'
commit
|
commitdiff
|
tree
2015-06-01
Jun
i
o C Hamano
Merge
branch 'jh/filte
r
-empty-co
n
tents'
commit
|
commitdiff
|
tree
2015-06-01
Junio C Hamano
Merge branch 'a
h
/
us
a
ge
-
strin
g
s'
commit
|
commitdiff
|
tree
2015-06-01
Junio C
H
amano
Merge br
a
n
c
h 'jk/http-bac
k
end-deadlock'
commit
|
commitdiff
|
tree
2015-06-01
J
u
n
io C Hama
n
o
Merge
b
r
anch 'dt/clean-
p
athspec-filter-then-l
s
tat'
commit
|
commitdiff
|
tree
2015-05-27
Junio C Hamano
Merge branch '
n
d
/
untracked-cache'
commit
|
commitdiff
|
tree
2015-05-27
Je
f
f
Kin
g
t7063
:
hide st
d
err from setup insi
d
e prereq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Sync with 2
.
4
.
2
commit
|
commitdiff
|
tree
2015-05-26
Junio C Ha
m
an
o
Git 2
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
J
un
i
o C Hamano
Merge
branch 'jk/sti
l
l-i
n
teresting' int
o
m
aint
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io
C
H
a
m
a
no
Me
r
ge branc
h
'j
c
/hash-ob
j
ect' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge br
a
nch '
j
k/rebase-qui
e
t-
n
oop' into maint
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C Ham
a
no
Merge b
r
anch 'sg/complete-d
e
c
orat
e
-ful
l
-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Merge
b
r
anch
'jk
/
filter-branch-
u
s
e
-of-sed-o
n
-in
c
omplet
e
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Ju
n
io C
H
am
a
no
M
e
rg
e
branch
'jc/daemon-n
o
-ipv6-for-2
.
4
.
1'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge branch
'jk/stash-
r
equ
i
r
e
-
clea
n
-index' in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2015-05-26
J
u
nio C Hamano
Merge bran
c
h 'jk/git-n
o
-more-
a
rgv0-path-
m
unging' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hamano
Fif
t
h batch for
2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-26
Jun
i
o
C H
a
mano
Merge branch 'nd/untracked-cache
'
commit
|
commitdiff
|
tree
2015-05-26
Junio C
Hamano
Merge br
a
nch 'rs/plug-
l
eak-in-pack-bi
t
ma
p
s'
commit
|
commitdiff
|
tree
2015-05-26
Juni
o
C H
a
man
o
Merge bra
n
ch 'pt/pull-ff-vs-merge-ff'
commit
|
commitdiff
|
tree
2015-05-26
J
u
ni
o
C Hama
n
o
Merge branch 'pt/pull-log-n'
commit
|
commitdiff
|
tree
2015-05-26
Junio C Haman
o
Merg
e
branch 'jk/rerere-forg
e
t-check-ena
b
led
'
commit
|
commitdiff
|
tree
2015-05-26
Junio
C
Hamano
Merge
branch 'jk/
h
t
t
p-
b
ac
k
end-deadlock-2
.
3' into jk
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Junio C Hama
n
o
M
e
rge branch '
j
k/htt
p
-b
a
ck
e
nd-deadlo
c
k-2
.
2'
into
j
k
.
.
.
commit
|
commitdiff
|
tree
2015-05-26
Jef
f
K
i
ng
htt
p
-
b
a
ckend: spool re
f
negotiati
o
n requ
e
sts to
b
uf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C Haman
o
Four
t
h ba
t
ch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Me
r
ge
b
ranch 'ps/doc-packfile-v
s
-pack-file'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
Hamano
Merge br
a
nch 'sb/
t
1020-c
l
e
a
n
up
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
Ham
a
no
M
e
r
ge bran
c
h
'lm
/
squelch-bg
-
pr
o
gress'
commit
|
commitdiff
|
tree
2015-05-22
Jun
i
o C Hamano
M
erge branch 'jc/ignore-epipe-
i
n-filter'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Me
r
ge branch 'mh/clon
e
-verbosit
y
-fix'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C
H
amano
Me
r
ge bra
n
ch 'pt/pull-t
a
gs-error-diag'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge branch 'mh/lockfil
e
-
r
etr
y
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
Merge branch 'jk/add-e-kill-edito
r
'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Ha
m
ano
Merge
b
ranch 'sg/completion-co
n
fig'
commit
|
commitdiff
|
tree
2015-05-22
J
unio
C
Hamano
Merge branc
h
'
m
h/r
e
f-di
r
ectory-fil
e
'
commit
|
commitdiff
|
tree
2015-05-22
J
u
n
io C Ham
a
no
Merge br
a
nch 'mh/write
-
ref
s
-soo
n
er
-
2
.
4'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
H
a
mano
Merge
b
ra
n
ch 'm
g
/
l
og-decorate-H
E
AD'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio
C Hamano
Me
r
ge br
a
n
ch 'jk/asciid
o
c-m
a
r
k
u
p-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C Hamano
Merge branch 'jk/stripspace-as
c
i
idoctor
-
f
ix
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hama
n
o
Merg
e
b
ran
c
h
'j
a
/tutorial-asciidoctor-fix'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Haman
o
Merge branch 'sg/help-subcom
m
ands'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C
H
amano
Merge branch
'p
s
/bundle-
v
erif
y
-arg'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Ham
a
no
Mer
g
e br
a
n
c
h
'ls/http-ssl-cip
h
e
r-list'
commit
|
commitdiff
|
tree
2015-05-22
Juni
o
C Hamano
Merge
b
r
anch
'
d
l
/
subtree-avoid-tricky-echo'
commit
|
commitdiff
|
tree
2015-05-22
Junio
C
H
amano
Merge branch 'jk/
s
kip-http-tests-und
e
r-no-curl'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio C Ham
a
no
Mer
g
e
branch
'
d
l
/subtree-pus
h
-no-squash'
commit
|
commitdiff
|
tree
2015-05-22
Junio C
H
a
mano
M
e
rge branch 'sg/com
p
letion-omit-
c
redential-helpers'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
M
e
rge branch 'dl/branch-
e
rror-mess
a
ge'
commit
|
commitdiff
|
tree
2015-05-22
Patrick Steinhardt
doc: fix in
c
onsiste
n
t spelling
of "
p
ackfil
e
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Agu
i
l
a
r
mergetools:
add
winme
r
ge as a builtin tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
David
Aguilar
me
r
getool--lib:
s
et IFS for difftool and
m
ergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Jeff Kin
g
t5551: facto
r
ou
t
t
a
g cr
e
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Junio C Haman
o
filter_
b
uffer_or_
f
d(): ignore E
P
IPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-20
Michael Colema
n
Docu
m
entation/git-commit:
g
rammofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o C Ham
a
n
o
copy
.
c: make copy_fd()
r
e
p
ort
its
stat
u
s silently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio
C Hamano
T
hi
r
d
batc
h
for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 's
b
/r
e
f-lock-lose-lock
-
fd'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
Merg
e
b
ranch 'kn/cat-fi
l
e-literall
y
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge bra
n
ch 'nd/d
w
im-wildcar
d
s-as-
p
athspecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
H
a
ma
n
o
M
e
rge branch 'jc/merge
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
Merge br
a
nch 'ph/
r
eba
s
e
-i-red
o
'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Haman
o
M
e
rg
e
b
ranch 'jc/test-pr
e
req-
v
alida
t
e'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o
C Hama
n
o
M
e
rge br
a
nch 'bc/c
o
nnect-p
l
ink'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Hamano
Mer
g
e
br
a
nch
'
jk/test-c
h
ain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merg
e
br
a
nch '
f
g/doc
u
ment
-
com
m
it-
m
essa
g
e-stripp
i
ng'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ham
a
no
Mer
g
e branch
'
jk
/
s
t
ash-requir
e
-
c
lean-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'j
k
/git-no-more-argv0-path-munging'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C
H
amano
Me
r
ge branc
h
'jc/git
i
gn
o
r
e
-prece
d
ence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch
'
nd/diff-i-t-a'
commit
|
commitdiff
|
tree
2015-05-19
Jeff King
progress: treat "no t
e
r
m
inal" as
being in the foreground
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
René Schar
f
e
pa
c
k
-bitmap
s
: plug me
m
ory leak, fix
a
llocation size
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Mike
H
ommey
c
l
o
n
e: ca
l
l transport_set_verbosity before any
t
hing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Stefan
Beller
subdi
r
ectory
t
ests: cod
e
c
l
eanup, un
c
omment test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
David Turner
cl
e
an: only lst
a
t
files
in
pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
p
u
ll: parse pull
.
ff as a bool or
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Paul Tan
pull: m
a
k
e pull
.
ff
=
true overr
i
de
m
erge
.
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Pa
u
l Tan
pull:
h
a
n
dle
-
-l
o
g
=<n>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-18
Jim Hill
sha1_file: pas
s
em
p
t
y
buf
f
er to index empty fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Pat
r
ick St
e
i
n
ha
r
dt
pack-pr
o
tocol
.
t
xt: fix insconsistent spelling
of
"
p
a
c
k
file"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
P
atrick
S
teinhard
t
git-unpack-objec
t
s
.
txt: fix inconsistent sp
e
llin
g
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-17
Pa
t
ric
k
Steinhardt
g
i
t
-
verify
-
pack
.
txt: fix i
n
cons
i
stent
spelling o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-15
Jeff King
htt
p
-backend: fix die recursion
w
i
t
h cus
t
o
m
handler
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Mic
h
ael Haggerty
lock_packed_refs(
)
: a
l
l
ow retries wh
e
n acqu
i
ring th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Mic
h
ael Hag
g
er
t
y
l
ockfile: allow fil
e
locking to b
e
retried with a
t
i
m
eout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
r
erere:
e
xit
silent
l
y on "forget"
w
hen
rerere is di
s
abled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
P
a
ul Tan
pull: remov
e
--ta
g
s error in no merge c
a
ndi
d
ates case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-14
Jeff King
d
o
c: conv
e
rt AsciiDoc
{
?foo} to ifdef::foo[]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio C Haman
o
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
G
it 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio
C Ham
a
no
Merge
branch '
s
b/li
n
e
-log-plug
-
pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'sb/test-b
i
tmap-free-at
-
end' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
Merge branch
'
nd
/
t
1509-chr
o
ot-test' int
o
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
e
rge br
a
n
c
h
'
jk/
t
ype-from-strin
g
-gently' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge branch 'ep/fix-test-lib-functions-rep
o
rt' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch
'
cn/bom
-
i
n-g
i
tign
o
r
e
' into maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C
Hamano
Mer
g
e
branch 'jk/prune-mtime' into maint
commit
|
commitdiff
|
tree
2015-05-13
Junio
C
Hamano
Me
r
g
e branch 'jk/init-core-
w
orktree-at-root' into mai
n
t
commit
|
commitdiff
|
tree
next