repo.or.cz
/
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 'pt/pull-ff-vs-merge-ff'
2015-05-06
Junio C Hamano
Merg
e
branch
'sb/test-bit
m
a
p
-free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hamano
Me
r
ge br
a
n
c
h '
l
d/p4-filetype-dete
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
am
a
no
Merge
b
r
anch 'ts
/
checkout-advice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
r
ge branch 'jk/
i
nit-core-worktree-at-roo
t
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ha
m
ano
Merge
b
r
anch 'mh/show-br
a
nch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Me
r
ge branch 'sb/line-log-plug-
p
air
d
iff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge
branch
'jc/diff-n
o
-index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hama
n
o
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hamano
d
a
emon:
unbreak
NO
_
IPV6 bu
i
ld
r
e
g
ression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C
H
a
m
ano
w
rite_sha1_
f
ile(): do not use a
s
e
parate
sha1[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hamano
Gi
t
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge: deprec
a
te 'gi
t
merge <
m
essage
>
HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge:
handle FET
C
H_HEAD inter
n
ally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ham
a
no
merge: decide if we auto-generate the mess
a
ge early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Hamano
merge:
m
a
ke col
l
ect_parents() auto-generate the
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C H
a
mano
merge: extract prepa
r
e_merge
_
message()
logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge
:
n
a
r
r
ow scop
e
o
f merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Haman
o
m
erge: split reduce_
p
arents() out of collect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C
H
amano
me
r
g
e
:
clarify collect_
p
are
n
ts
(
)
log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small le
a
k
fix
a
nd
c
ode si
m
p
l
i
f
icatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hama
n
o
m
erg
e
: do not check argc to determ
i
ne number of
remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
H
amano
m
erge: clarify "pulling into
v
oi
d
" special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
t
5
5
20: test pu
l
ling an octopus into an unborn
b
ra
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C H
a
mano
t
5520: style fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
merge: s
i
mplify code
flo
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hamano
mer
g
e: test the top-level merge
d
river
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C Ham
a
n
o
test: validate prerequ
i
s
tes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
J
u
nio
C Hamano
Merge branch 'mh/multimail-re
n
ewal'
commit
|
commitdiff
|
tree
2015-04-28
J
unio C Ha
m
ano
Merge branch 'mg/s
h
ow-notes-d
o
c'
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
Merg
e
branc
h
'nd/versioncmp-prereleases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge
branch 'm
g
/
s
t
atus-v-v'
commit
|
commitdiff
|
tree
2015-04-27
Junio C H
a
mano
Sync with 2
.
3
.
7
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
Git
2
.
3
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge
bra
n
ch 'tb/connect
-
i
pv6-parse-f
i
x' int
o
main
t
commit
|
commitdiff
|
tree
2015-04-27
J
u
nio C Hamano
M
e
rge branch 'ma/bash-completion-
l
eaki
n
g
-
x
'
into maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Haman
o
Merge bra
n
c
h
'jc/pus
h
-ce
r
t' into main
t
commit
|
commitdiff
|
tree
2015-04-22
Junio C Hamano
ignore:
i
n
fo/exclu
d
e
s
hould trum
p
core
.
excludesfi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-22
Junio
C
Ham
a
n
o
Git 2
.
4
.
0-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Haman
o
Sy
n
c with
mai
n
t
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
Ham
a
no
Merge
b
r
anch 'jk/
c
olors' into m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io
C Hamano
Merge branch 'jk/test-annoyanc
e
s' into maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hama
n
o
M
erge branch 'pt/
e
nter-repo-comment-fix' int
o
maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C Hamano
M
e
r
g
e
branch 'jz/gitw
e
b-conf-doc-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge
b
ranch 'jk/cherry
-
pick-docfix
'
into main
t
commit
|
commitdiff
|
tree
2015-04-21
J
u
n
i
o
C
H
aman
o
Merge branch 'iu
/
f
i
x-parse-options-h-
c
omment'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio
C Ha
m
a
n
o
Merge branch 'jg/cguide-we-cannot-coun
t
'
i
nto
maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
a
mano
M
erge branch 'jk/
p
ack-corruption-post
-
m
o
rtem'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
J
u
nio
C Hamano
Merge
b
r
anch 'jn/do
c
-fa
s
t
-
import-n
o
-16-octopu
s
-limit
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
RelNotes: "merge -
-
qui
e
t" chang
e
h
a
s been reverted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
J
u
nio C Ham
a
no
H
opefully
t
he last ba
t
ch for 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-20
Junio C Ha
m
a
n
o
Merge branc
h
'ps
/
g
r
ep-he
l
p-
a
ll
-
callback-arg'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hamano
Merg
e
b
r
anch
'tb/connect-
i
pv6-parse-fix'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Haman
o
M
erge branch
'va
/
fix-git-p4-t
e
st
s
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C Hama
n
o
Merge
b
ranch
'
jc/push-cert'
commit
|
commitdiff
|
tree
2015-04-20
J
unio C Hama
n
o
Merge branch 'ma/bash-
c
omplet
i
on-leaking-
x
'
commit
|
commitdiff
|
tree
2015-04-20
Junio C H
a
mano
fmt-merge-
m
sg: pl
u
g smal
l
leak of commit buf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-19
Junio C Hamano
Merge
tag 'gitgui-0
.
20
.
0' of http://repo
.
or
.
c
z
/
r/g
i
t-gui
commit
|
commitdiff
|
tree
2015-04-16
Junio C
Ha
m
ano
a
ttr
:
ski
p
UTF8
BOM at the
b
egi
n
n
in
g
of the input f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
unio
C
H
amano
c
onfig: use utf
8
_bo
m
[] from utf
.
[ch
]
in git_p
a
rse_so
u
rce(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
J
u
nio
C
Hama
n
o
u
t
f8-b
o
m:
introduce skip_utf8
_
bom() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C Hamano
add_excludes_from
_
file: clar
i
fy the bom ski
p
ping
l
ogi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-16
Junio C H
a
mano
Revert "
m
erge: p
a
ss verbos
i
ty flag down to m
e
rge-re
c
ur
s
ive"
commit
|
commitdiff
|
tree
2015-04-15
Juni
o
C Hamano
par
s
e_date_basic(): let the syst
e
m ha
n
dle DS
T
conve
r
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-15
J
u
nio C
Hamano
parse_date_basic():
r
eturn ear
l
y w
h
en giv
e
n
a bogu
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
J
unio C Hamano
Git
2
.
4
.
0-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Me
r
ge branch 'jk/colo
r
s
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'jk/merge-quiet'
commit
|
commitdiff
|
tree
2015-04-14
Junio C
H
amano
Merge branc
h
'jk/pack-co
r
r
up
t
i
o
n
-
post-mortem'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
n
o
Merge b
r
a
nch 'jc/update-i
n
stead-in
t
o-voi
d
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Haman
o
M
e
r
ge branch 'sb/plug-streaming-leak'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Ham
a
n
o
Merge bran
c
h 'jn/
d
oc-fast-import-n
o
-16-o
c
topus-li
m
it'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Ham
a
n
o
Me
r
ge
branch 'sb/plug
-
wt-shortstat
u
s-tracking-l
e
ak
'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merg
e
branc
h
'pt/
e
nter
-
repo-comm
e
n
t
-fix'
commit
|
commitdiff
|
tree
2015-04-14
Junio
C
Hamano
M
e
r
ge branc
h
'
jz/git
w
e
b-conf-doc-fix
'
commit
|
commitdiff
|
tree
2015-04-14
Jun
i
o
C
Hamano
Merge bra
n
c
h
'jk/cherry-pick-docfix'
commit
|
commitdiff
|
tree
2015-04-14
Junio C Hamano
Merge branch 'iu/fix
-
p
a
rse-op
t
io
n
s-h
-
comment'
commit
|
commitdiff
|
tree
2015-04-14
J
u
n
i
o C Haman
o
Merge branch 'jg/cg
u
ide-we-cannot-
c
ount'
commit
|
commitdiff
|
tree
2015-04-09
Junio
C
Haman
o
Merge tag 'l10
n
-2
.
4
.
0-
r
nd2' of gi
t
://githu
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2015-04-02
Ju
n
io
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
Me
r
ge branch '
s
b/atom
i
c-push'
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
pus
h
--signed:
tig
h
ten what the receivin
g
e
n
d c
a
n ask
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-02
Junio C Hamano
push-to-de
p
loy: allow pushing in
t
o an unb
o
r
n
bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-31
J
u
nio C Haman
o
Sync with 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
Junio C Hama
n
o
M
erge branch 'ss/pull-reba
s
e-preserve' into m
a
in
t
commit
|
commitdiff
|
tree
2015-03-31
J
u
nio C Hamano
Mer
g
e bran
c
h 'jc/report
-
path-er
r
o
r
-t
o
-
d
ir' into mai
n
t
commit
|
commitdiff
|
tree
2015-03-31
Junio C
Hamano
Merge branch 'ph/
p
us
h
-do
c
-
c
as' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2015-03-28
J
u
ni
o
C Hamano
Syn
c
w
ith maint
commit
|
commitdiff
|
tree
2015-03-28
Juni
o
C Ha
m
ano
RelNotes: minor
d
oc
upda
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge branc
h
'ph/push
-
doc-cas'
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o
C
Hama
n
o
Merge branch 'ss/pu
l
l-rebase-preserve'
commit
|
commitdiff
|
tree
2015-03-28
Junio C Ham
a
no
Prepare fo
r
2
.
3
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
branch 'sg/
c
ompletion-gitcomp-nl-for-refs' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hama
n
o
M
erge br
a
nch
'
jk/
s
implify-
c
sum-file-sha1fd-check' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Merge branch 'tg/te
s
t
-
in
d
ex
-
v
4
' into
m
a
int
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
b
ranch
'nd/doc-git-inde
x
-
v
ersion' into
m
ain
t
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
i
o
C Hamano
Merge branch 'ct/prom
p
t
-untracked-fix' into m
a
in
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge bra
n
ch 'ws/grep
-
qu
i
et
-
no-page
r
' into
maint
commit
|
commitdiff
|
tree
2015-03-28
Junio C H
a
mano
Merge branch
'
jc/submi
t
t
ing-p
a
tches-mention-
s
end-email
.
.
.
commit
|
commitdiff
|
tree
next