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
Merge branch 'jc/ignore-epipe-in-filter'
2015-05-06
Junio C
H
amano
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C H
a
m
a
no
d
a
emon: unbr
e
ak NO_IPV6 buil
d
r
egression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Haman
o
w
rite_sh
a
1_file()
:
d
o
not use
a
se
p
arate s
h
a1[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C
Hama
n
o
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
m
e
rge:
d
e
p
recate '
g
i
t merge <m
e
ssage> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
g
e: hand
l
e
FET
C
H_HEAD interna
l
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C H
a
ma
n
o
merge: dec
i
d
e if we
a
uto-generate the message ea
r
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C H
a
mano
merge: make coll
e
ct_parents()
a
uto-gen
e
rate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: ext
r
act
p
repare_merg
e
_message() logic ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Haman
o
m
erge: na
r
row scope of merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
erge: split re
d
uce_p
a
r
ents() out of collect_p
a
r
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
mano
merge
:
clar
i
fy c
o
llect_parent
s
() lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
ni
o
C Ha
m
a
n
o
merge: small lea
k
fix and code
s
im
p
li
f
ica
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C H
a
mano
merge: do
not check argc t
o
de
t
e
rmine
n
um
b
er of rem
o
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge: cla
r
ify "pulling into voi
d
"
special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5520: test pulling an octopus
i
nto an u
n
born branc
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
t5
5
20
:
style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: simplify code
flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
test the top-level merg
e
driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
test:
v
a
lidate pr
e
requistes
s
yntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge branch 'mh/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
e
rge branch 'mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
e
rge branch '
n
d/version
c
mp-
p
rereleases'
commit
|
commitdiff
|
tree
2015-04-28
Jun
i
o
C Ha
m
ano
Merge br
a
nc
h
'mg/statu
s
-v-v
'
commit
|
commitdiff
|
tree
2015-04-27
J
unio
C
Hamano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
unio C
H
a
mano
Git 2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Jun
i
o
C
Ha
m
a
no
Merge
b
r
anch
'
t
b
/connect-ipv6-pars
e
-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
M
e
rge br
a
nc
h
'ma/bash
-
c
o
m
pletion-lea
k
ing
-
x' into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
Merg
e
branch 'jc/push-cert
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-04-22
Juni
o
C Hamano
ignore:
i
n
f
o/
e
xclude should trump cor
e
.
excludesfile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio C Ha
m
ano
G
it 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hama
n
o
Sync with maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git 2
.
3
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Juni
o
C Ham
a
no
Mer
g
e branch 'jk/colo
r
s' into maint
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Merge bran
c
h 'jk/test-annoyances'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'pt/enter-
r
epo-
c
omment-f
i
x' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C
Hamano
Merge branch
'jz/gitweb
-
conf
-
doc
-
fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch
'
jk/cherry-pick
-
docfix'
i
nto maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'iu/fix-parse-opti
o
ns
-
h
-comment'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Ha
m
ano
Mer
g
e branch 'jg/cguide-we-
c
a
n
n
o
t
-cou
n
t'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Mer
g
e branch 'jk/pack-
c
o
r
ruption-post
-
mortem' into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
Haman
o
Merge branc
h
'jn/doc-fas
t
-import-n
o
-
1
6-octopus-lim
i
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
R
e
lNotes:
"m
e
rge
-
-q
u
iet" chang
e
has bee
n
re
v
erted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Jun
i
o C Hamano
H
opefully the last batch
f
o
r
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Mer
g
e bran
c
h 'ps/
g
rep-hel
p
-
a
l
l
-callback-arg'
commit
|
commitdiff
|
tree
2015-04-20
J
un
i
o
C
Hamano
Merge branch 'tb/connect-ipv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
a
m
ano
Merge
b
r
anch 'va/
f
ix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
amano
Merge branch 'jc/push
-
cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C
H
a
mano
Merge branch 'ma/bash-completi
o
n
-le
a
king
-
x'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
fmt-merge-m
s
g: plug
s
ma
l
l
l
e
ak of
c
om
m
it buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Hamano
Merge
t
a
g
'gitgui-0
.
20
.
0'
o
f http://repo
.
or
.
cz/
r
/git-gui
commit
|
commitdiff
|
tree
2015-04-16
J
un
i
o C Ha
m
a
no
attr: skip UTF8 BOM at the beginning o
f
the i
n
put file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Jun
i
o
C
Haman
o
con
f
ig: use ut
f
8_bom[] from
u
tf
.
[c
h
] in git_parse
_
s
ource
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C H
a
mano
utf8-bom: introduc
e
skip_utf8_bom() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
add_e
x
cludes_from_fi
l
e
: cl
a
r
i
fy the bom skipping l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
Re
v
ert "merge:
p
a
s
s
verbosity
f
lag
down to merge-recursive"
commit
|
commitdiff
|
tree
2015-04-15
Junio
C Hamano
parse_date_b
a
sic(
)
:
let the sys
t
e
m h
a
ndle
D
ST conversi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
Junio
C H
a
mano
p
a
r
se
_
date_basic()
:
return early when giv
e
n a
b
ogus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Haman
o
Git 2
.
4
.
0-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C
H
amano
Merge
b
r
anch
'
jk/colors'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Hamano
M
erge branch 'jk/mer
g
e-qui
e
t'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Hamano
Merge branch
'
jk/pac
k
-corrup
t
ion-p
o
st-
m
ortem'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C Hamano
Me
r
ge branch 'jc/update-in
s
tead-into-vo
i
d'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Me
r
ge br
a
nch 'sb/plug
-
streaming-leak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hama
n
o
M
er
g
e branch 'jn/doc-fast
-
import-no-16-octopus-limit'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
amano
Merge
branc
h
'sb/plug-wt-shortstatus
-
trac
k
ing-
l
eak'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Haman
o
Merge branch 'pt
/
enter-rep
o
-
c
omment-fix'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio C Hamano
Merge branch
'
jz/g
i
t
w
eb-co
n
f-doc-fix'
commit
|
commitdiff
|
tree
2015-04-14
J
unio C Ham
a
no
Merge branch
'
jk/
c
herr
y
-pick-d
o
c
f
ix'
commit
|
commitdiff
|
tree
2015-04-14
Juni
o
C Ha
m
ano
Merge bran
c
h
'iu/fix-parse-options-h-comment'
commit
|
commitdiff
|
tree
2015-04-14
J
unio C Hamano
Merge branch
'
jg/cg
u
ide
-
we-cannot-count'
commit
|
commitdiff
|
tree
2015-04-09
J
unio C Hama
n
o
Merg
e
tag 'l10n-2
.
4
.
0-rnd2' of git://g
i
thub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
J
unio C Ha
m
an
o
Git
2
.
4
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
Merge bran
c
h 'sb/ato
m
ic-push'
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
push --signe
d
: tighten what the rece
i
v
ing
e
nd
c
an
a
sk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
J
u
nio C Ha
m
ano
push-to-deploy
:
allow pushing
i
n
to
a
n
unborn
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C
Hamano
Sync w
i
t
h
2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Hamano
Git 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge bra
n
c
h 'ss/pull-rebase-preserve' into m
a
int
commit
|
commitdiff
|
tree
2015-03-31
Junio C Ham
a
no
Merge branch 'jc
/
repo
r
t-
p
ath-error-to-
d
ir'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
Merge bra
n
ch 'ph/push
-
doc-cas'
i
nto maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Sync with main
t
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hamano
RelNotes: minor
doc updat
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C
H
a
m
a
no
Merge branch 'ph/push
-
doc-c
a
s
'
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Ham
a
n
o
Merge branch
'
ss/pull-rebas
e
-
preserve'
commit
|
commitdiff
|
tree
2015-03-28
Junio C
H
a
mano
P
rep
a
re for 2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C Hama
n
o
Merge bran
c
h
'
sg/c
o
mp
l
eti
o
n-gitcomp-
n
l-for-refs' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
e
rge branch
'jk/
s
impli
f
y-
c
sum-file-s
h
a1fd-
c
heck' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Hamano
Merge
b
ranch 'tg/test-index-v4' into
m
aint
commit
|
commitdiff
|
tree
2015-03-28
Junio C
Haman
o
Mer
g
e
branch 'nd/doc-git-index-version' into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Mer
g
e branch 'ct/p
r
ompt-
u
ntracked
-
f
i
x
' int
o
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
M
e
rge branch
'w
s
/grep-quiet-no-p
a
ger' into
maint
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Ham
a
no
Merge
branch 'jc/submitting-patches-mention-s
e
nd-
e
mail
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
unio C H
a
m
a
no
Merg
e
branch 'jk/cleanup-fai
l
e
d
-c
l
one' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
b
ranc
h
'jk
/
f
etch-pack'
i
nt
o
ma
i
nt
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
H
a
man
o
Merge branc
h
'tg/fix-check-order-wi
t
h-
s
pli
t
-in
d
ex'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C
Hamano
M
erge branch 'jk/prune
-
with-corrupt-refs
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2015-03-28
Junio
C
Hamano
Merge b
r
a
nch '
j
n/doc-api-e
r
rors'
commit
|
commitdiff
|
tree
2015-03-27
Junio C Hamano
Sync wit
h
maint
commit
|
commitdiff
|
tree
2015-03-27
Ju
n
i
o C Hamano
M
e
rge branch
'
sb/leak
s
'
commit
|
commitdiff
|
tree
next