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 'jc/do-not-feed-tags-to-clear-commit-marks'
2015-05-06
Ju
n
io
C
Hamano
First batch for 2
.
5 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Ham
a
n
o
M
e
rge
br
a
nch 'jk/p
r
une-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranch
'
m
m/
u
sage-log-l
-
can-tak
e
-rege
x
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge
b
ranc
h
'
e
p/fix-test-lib-
f
u
nctio
n
s-rep
o
rt'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o C Hamano
M
e
rge branc
h
'cn/bom-in-gitig
n
ore'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
H
am
a
no
Me
r
ge
b
ranch
'
jc/epoch
t
ime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
M
e
r
ge branch 'nd/
t
1
5
09-ch
r
oot-te
s
t'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Merge
branch 'oh/fix-con
f
ig
-
default-user-
n
ame
-
s
ec
t
i
on'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Ham
a
n
o
M
erge branch 'jk/typ
e
-f
r
om-str
i
ng-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch 'sb/test-bitm
a
p
-
free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C H
a
mano
Merge b
r
anch '
l
d/p4
-
f
i
letype-det
e
ction'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge branch 'ts/checkout
-
advice-plural'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Ham
a
n
o
Me
r
ge
branch 'jk
/
init-core-wor
k
tree-at-ro
o
t'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Me
r
ge bra
n
ch 'mh/show
-
branch
-
topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
am
a
no
Merge branch 'sb/line-log-
p
lug-
p
aird
i
f
f
-
l
eak'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch 'jc/
d
iff-no-index-d-f
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch 'bc/object-id
'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
d
a
emon:
u
nbreak NO
_
IPV6 b
u
ild regre
s
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-05
J
u
n
io
C
H
a
m
ano
write_
s
ha1_file
(
): do not use a separat
e
sha1[] array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C
H
a
man
o
Git 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
m
e
r
ge:
depre
c
ate
'
git merge <message> HEAD <c
o
m
m
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hama
n
o
merge: handle FETCH_HEAD inte
r
n
ally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
me
r
ge:
d
e
cide if we
a
uto-generate th
e
message early
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge:
m
ake
collect_p
a
rents(
)
aut
o
-
generat
e
the merg
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merg
e
: ex
t
rac
t
p
r
epare_mer
g
e_message() logic out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
merge: narrow scope of merge_
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
m
erge: sp
l
it reduce_pa
r
en
t
s
(
)
out of collec
t
_
p
are
n
ts()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io
C Hama
n
o
merge: clarify
colle
c
t_pare
n
ts
(
) lo
g
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
mer
g
e: small
l
eak
f
ix a
n
d
code sim
p
lificat
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
ge
:
do not check argc to dete
r
mi
n
e number of remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: c
l
a
rify "
p
ull
i
n
g
into void"
s
pecial case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
t5520: tes
t
pu
l
li
n
g an oct
o
p
us into an unborn br
a
nch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
t5520: style fixe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
rge: simplify code flow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io
C Haman
o
merge: test the
t
op-
l
e
vel merge drive
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Haman
o
t
est: v
a
lidate pr
e
r
equistes syntax
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
Merge branch
'
mg/show-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C Hamano
M
e
r
ge branch 'nd/versioncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
erge
branch 'mg/status-
v
-v'
commit
|
commitdiff
|
tree
2015-04-27
Juni
o
C Ham
a
no
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
Junio C H
a
mano
G
it
2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
J
unio
C
H
a
mano
M
e
rge
branch 'tb/connec
t
-ipv6-parse-f
i
x'
into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
Ham
a
n
o
Merge b
r
anch 'ma/bash-compl
e
tion-leaki
n
g
-
x
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio
C Hamano
M
e
rge bran
c
h
'j
c
/push-cert' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2015-04-22
Junio C Hamano
i
gn
o
re: info/exclude should trump core
.
e
xcludes
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-22
Ju
n
io C Ha
m
ano
G
i
t 2
.
4
.
0-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
m
a
no
Sy
n
c 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
Junio C Hama
n
o
M
e
rge branch 'jk
/
colors' into
m
aint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C Hamano
Merge branch 'jk/test-annoyan
c
es' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio C
H
amano
Merge branch
'
pt/
e
n
ter-repo-comment
-
fix' into main
t
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C
H
a
ma
n
o
Me
r
ge branch 'jz/git
w
e
b
-c
o
nf-doc-fix' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Haman
o
M
erge branch 'jk
/
cherry-p
i
ck-doc
f
ix' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
mano
Merge b
r
anch 'iu/f
i
x-parse-options-h-comme
n
t
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C
H
am
a
no
Merge branch
'
jg
/
cguide-we-canno
t
-count' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C Hamano
Merge branch '
j
k/pack-c
o
r
r
uption-p
o
s
t-mortem' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
mano
Merge branc
h
'jn/doc
-
fast-impor
t
-no-16-oct
o
pus-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
R
e
lNote
s
:
"
m
erge
-
-q
u
iet" c
h
ange has been
r
e
ver
t
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Hopefully the last
batch for 2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Junio
C
Hamano
Merge b
r
an
c
h
'
p
s/grep-help-all-callb
a
ck-arg'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
M
e
r
ge branch 'tb/c
o
n
n
ect
-
ipv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merge branch 'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-04-20
Ju
n
io C Hamano
M
erge br
a
nch 'jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hama
n
o
M
erge
b
ranch
'
ma/bash-
c
ompletio
n
-leaking-x'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hama
n
o
fmt-merge-
m
sg: plug smal
l
leak of commi
t
b
u
f
f
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Ha
m
ano
Merge
t
ag 'gitgui-0
.
20
.
0'
of http://
r
epo
.
or
.
cz/r/git-gui
commit
|
commitdiff
|
tree
2015-04-16
Junio C
Hamano
attr:
s
k
ip UTF8
BO
M
at th
e
be
g
inning
of
t
he
i
nput f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hama
n
o
config:
u
se
u
tf
8
_bom[]
fro
m
utf
.
[ch] in g
i
t_parse_source()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
ut
f
8-bo
m
: introduce
s
k
i
p_utf8_bom() helper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio
C Hamano
add
_
e
xcl
u
d
e
s_fro
m
_file: clari
f
y the bo
m
s
kipping
l
og
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-16
Junio C H
a
mano
Revert "merge: p
a
s
s verbosit
y
fla
g
down
t
o merge-recursive"
commit
|
commitdiff
|
tree
2015-04-15
J
un
i
o
C Hamano
par
s
e_dat
e
_basic():
l
et th
e
s
ystem handle
DST c
o
nve
r
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Ha
m
ano
parse_da
t
e_ba
s
ic(): return
ear
l
y when given
a
bog
u
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Git 2
.
4
.
0-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C Hama
n
o
Me
r
ge branch 'jk/colors'
commit
|
commitdiff
|
tree
2015-04-14
J
u
nio
C Hamano
Merge branch
'
j
k
/m
e
rge-qui
e
t'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jk/pack-corrup
t
ion-pos
t
-mortem'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io C Hamano
Merge branch '
j
c/update-ins
t
ead-in
t
o-voi
d
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge br
a
nch 's
b
/plug-streaming-leak'
commit
|
commitdiff
|
tree
2015-04-14
Ju
n
io C Hamano
Merge branch 'jn/
d
oc-fast-impo
r
t-no-16-octop
u
s-limit'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
i
o C Hamano
Merge branch '
s
b/plug-wt-shorts
t
atus-tra
c
kin
g
-
l
eak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Mer
g
e branch 'p
t
/enter-repo
-
c
o
mment-f
i
x'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ha
m
a
n
o
Merge bra
n
c
h
'jz/gitweb-conf
-
doc-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C Hamano
Merge branch 'jk/cherry-pick-docfix'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C Hamano
Merge branch 'i
u
/fix-p
a
rs
e
-op
t
i
ons-h-comment'
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o C Hamano
M
e
rge branch 'jg
/
cguide-we-cannot
-
count'
commit
|
commitdiff
|
tree
2015-04-09
Junio C Hamano
Merge
t
ag 'l1
0
n-
2
.
4
.
0
-rnd2' of git://githu
b
.
com/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Ju
n
i
o
C
Hama
n
o
G
i
t
2
.
4
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
Merge br
a
nch
'sb/atomic-push'
commit
|
commitdiff
|
tree
2015-04-02
J
unio
C Hamano
pu
s
h --sig
n
ed:
t
i
ght
e
n
what the re
c
eiving
e
n
d can ask
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
push-
t
o
-
d
e
p
loy: allow push
i
ng i
n
t
o
an unborn branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
J
u
nio
C
Hamano
S
y
nc w
i
th 2
.
3
.
5
commit
|
commitdiff
|
tree
2015-03-31
Junio C
Hamano
Git 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Jun
i
o
C Hamano
Me
r
ge bra
n
c
h
'ss/pull-reb
a
se-
p
reserve
'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-03-31
J
unio C Hamano
M
e
rge branch 'jc/rep
o
rt-path-error-to-
d
ir' i
n
to main
t
commit
|
commitdiff
|
tree
2015-03-31
Junio C Haman
o
Me
r
ge
b
ranch 'ph/pus
h
-doc-cas' into maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
RelNotes: minor doc
up
d
ates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
J
uni
o
C Haman
o
Merge b
r
anch 'ph/pus
h
-
d
oc-cas'
commit
|
commitdiff
|
tree
next