repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fourth batch for 2.5 cycle
2015-05-06
Junio C Haman
o
Merge branch '
j
k/in
i
t-
c
ore-
w
or
k
t
r
e
e-at
-
root
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hama
n
o
Merg
e
branch 'mh
/
s
how-branch
-
t
o
pic'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io C Haman
o
M
e
rge branch 'sb/line-l
o
g-plu
g
-pa
i
rdi
f
f-leak'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
Haman
o
Merge branch '
j
c/di
f
f-no-
i
n
d
ex-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merg
e
branch
'
bc/o
b
ject-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio
C Ha
m
ano
d
aem
o
n: unb
r
eak NO_IPV
6
build regres
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Haman
o
wr
i
te_sha
1
_fil
e
(): do not use a separat
e
sha
1
[]
array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o
C H
a
mano
merge: deprec
a
te 'git merge <
m
essage> HEAD <
c
ommit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merg
e
:
handle FETCH_HE
A
D
i
n
ternally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C
Hamano
merge: de
c
ide if we auto-generate the
m
ess
a
ge early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: make
collect_parents()
auto
-
g
e
n
e
ra
t
e the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge: extract prepare_
m
erge_message() logi
c
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge: narr
o
w scope of
m
erge_name
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: split reduce_paren
t
s(
)
out of
c
ollect_
p
ar
e
n
t
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C H
a
ma
n
o
merg
e
:
clarify collect_parents() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
mer
g
e: small leakfix and code simplifi
c
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C
H
a
m
ano
merge: do not check
a
rg
c
to de
t
ermine number of r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
c
l
arify "pulli
n
g into void" special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
m
a
no
t5520: test pulli
n
g
an oct
o
pus into an
un
b
orn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io
C Hamano
t55
2
0: style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge:
s
implify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Ha
m
ano
merge: test the top-l
e
vel
merg
e
driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Haman
o
test: v
a
lida
t
e prerequi
s
tes synt
a
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C
Haman
o
Merge b
r
anch
'
mh
/
multi
m
ail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
H
a
ma
n
o
Merge branch
'mg/show-n
o
t
es-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
ama
n
o
M
e
rge branch 'nd/versioncmp
-
prereleases'
commit
|
commitdiff
|
tree
2015-04-28
J
u
n
i
o C Hama
n
o
Merge
bra
n
ch 'mg/
s
tatus-
v
-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Syn
c
with
2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C
H
amano
Merge b
r
anch
'tb/
c
o
n
nect-ipv6-
p
ar
s
e-fix
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
i
o
C Ha
m
ano
Me
r
ge branch 'ma/bash-completion-leaking-x' into maint
commit
|
commitdiff
|
tree
2015-04-27
J
unio
C
Hamano
Merge branch 'jc/push-cert' into
m
aint
commit
|
commitdiff
|
tree
2015-04-22
Jun
i
o C
Hamano
ignore: info/exclude should trump core
.
excludesfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
J
u
n
i
o C Haman
o
Git 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Gi
t
2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C
H
amano
M
erge bra
n
ch 'jk/colors' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ham
a
no
Merge branch 'jk
/
test-annoyances' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o C
H
am
a
no
Merge branch 'pt/ent
e
r-repo
-
comment-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge b
r
anch 'jz/gitw
e
b-co
n
f-do
c
-fix' in
t
o
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Me
r
ge
b
r
anch 'jk/ch
e
rry-p
i
ck-docfix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge branch 'iu/fix-parse-o
p
t
i
on
s
-h-commen
t
' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'jg/cguide-we-canno
t
-count' into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Merge bra
n
ch 'jk/pa
c
k-corruption-post-mortem'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Hamano
Merge branch 'jn/do
c
-fast-import-no-16-octopus-l
i
mit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
RelNotes: "mer
g
e --quiet" change has b
e
en reverte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
amano
Ho
p
efully the
last batch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
amano
Mer
g
e branch 'ps/grep-help-a
l
l-callback-
a
r
g'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ha
m
ano
Merge branch 'tb/connect-ipv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C H
a
man
o
Merge branch
'
v
a/
f
ix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Juni
o
C Ham
a
no
M
e
rge branch 'jc/push-
c
ert'
commit
|
commitdiff
|
tree
2015-04-20
J
u
n
io
C Hamano
Merge bra
n
ch 'm
a
/
bash-completion-leaking
-
x'
commit
|
commitdiff
|
tree
2015-04-20
J
unio C Hamano
fmt-merge-msg: plug
small
lea
k
of commit bu
f
fe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
J
u
nio C
Ham
a
no
Merge tag 'git
g
ui
-
0
.
20
.
0' of htt
p
://r
e
po
.
or
.
cz/
r
/git-gui
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
Ha
m
ano
attr: skip UTF8 BOM a
t
th
e
beginn
i
ng of the
i
nput file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C
Hama
n
o
config: use
u
tf8_bom[] from utf
.
[ch] in
git_par
s
e_source()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C Hamano
utf8-bom
:
intro
d
uce skip_utf8_bom() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
u
nio C Hamano
add_exclu
d
es
_
from_file: clarify t
h
e bom s
k
ip
p
ing logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Haman
o
Revert "merge: pass verbos
i
ty flag down to
m
erge-recursi
v
e"
commit
|
commitdiff
|
tree
2015-04-15
Jun
i
o C Hamano
par
s
e_date_basic(): le
t
the sys
t
em
ha
n
dle DST con
v
e
rsion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio C H
a
mano
pa
r
se_date_basic(): return e
a
rly when given a
bogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Hamano
G
it
2
.
4
.
0
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C H
a
mano
Merge branch 'jk/
c
o
l
ors'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
no
M
erge b
r
a
nch 'jk/merge-quiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
amano
M
e
rge bra
n
c
h
'jk/pack-
c
orru
p
t
i
on-post-
m
o
rtem'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
no
Merge
b
ranch 'jc/upda
t
e-i
n
stead-into-void'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Hamano
Merg
e
branch 'sb/pl
u
g-streaming-lea
k
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
amano
M
e
r
g
e branch 'jn/doc-fast
-
import-no-16-oc
t
opus-limit'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io
C
Hamano
Merge br
a
nch 's
b
/plug-wt
-
shortstatus-tr
a
ckin
g
-l
e
ak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merg
e
branch 'pt/enter
-
repo-comment-f
i
x
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hama
n
o
Merge bran
c
h 'jz/git
w
eb-conf-doc-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
Ham
a
no
Merge b
r
a
n
ch 'jk/cherry-pick-docfix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
amano
M
e
rge branch 'iu/fix-parse
-
o
ptions-h
-
comment'
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C Hamano
M
e
rge branch 'jg/cguide-we-cann
o
t-count'
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
Me
r
ge t
a
g 'l10n-2
.
4
.
0
-
r
nd2' of
git://g
i
t
h
ub
.
co
m
/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
G
i
t
2
.
4
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Ham
a
no
Mer
g
e
branch 'sb/atomic-push'
commit
|
commitdiff
|
tree
2015-04-02
Ju
n
io C Ha
m
ano
pu
s
h --signe
d
: tighten what the rece
i
ving end
can ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio
C
Ha
m
ano
p
u
sh-to-deploy: al
l
ow p
u
shing into an un
b
orn branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Ju
n
io C Hamano
Sync with 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
J
u
n
io C Hamano
Git
2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C H
a
mano
Merge branch '
s
s/
p
u
l
l-rebase-preserve' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-31
Junio
C
Hamano
Me
r
ge branch '
j
c/re
p
or
t
-path-error-to-d
i
r
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Ha
m
ano
Mer
g
e
b
r
an
c
h '
p
h
/
push-doc-cas' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Syn
c
wi
t
h ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
J
u
ni
o
C Hamano
R
e
lNote
s
: minor doc updates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io
C Hamano
Me
r
ge b
r
a
nch 'ph/push-
d
oc-cas'
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ha
m
ano
Mer
g
e branch 'ss/pull-
r
e
b
ase-p
r
eserve'
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
a
m
ano
Pr
e
pa
r
e
f
or 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'sg/comp
l
etio
n
-g
i
tcomp-
n
l-for-refs' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hama
n
o
Merge branch 'jk/simpl
i
fy-c
s
um-
f
ile-sha1fd-check' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
Merg
e
bra
n
ch 'tg/
t
e
st-
i
ndex-v4' into maint
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hama
n
o
Merge branch
'
nd/
d
oc-git-index-version
'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o
C
Hamano
M
erge bran
c
h 'ct/prompt-untracked-fix' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'ws/grep-quiet
-
no-
p
ager' in
t
o maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge bran
c
h 'jc/su
b
mitting-patches-ment
i
o
n
-sen
d
-email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branch 'jk/cl
e
anu
p
-failed-clone' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
branc
h
'jk/fet
c
h-pack
'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
i
o
C Haman
o
Merg
e
branch '
t
g/fix-chec
k
-order-with-sp
l
it-index'
.
.
.
commit
|
commitdiff
|
tree
next